upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-06 15:22:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
9359 commits 876 branches 156 tags 129 MiB
Commit graph

345 commits

Author SHA1 Message Date
Erica Portnoy
9f2dfc15fe Restructure how Nginx parser re-finds vhosts, and disable creating new server blocks. (#3528) 
* Restructure add_server_directives to take a vhost as argument. This is the first step towards fixing vhost selection in nginx.

* Save path to vhost in file while parsing in get_vhosts().

* Disable creating a new server block when no names match.

* Make parser select vhost based on information in the vhost it found previously, rather than searching again for a match.

* Make add_server_directives update the passed vhost

* Update boulder config to pass test

* Add testing code for the _do_for_subarray function

* documentation and formatting updates
 2016-09-26 13:13:29 -07:00
Peter Eckersley
2434b4a549 Merge pull request #3507 from certbot/only-suggest-valid-names 
Only suggest names LE will accept
 2016-09-22 14:23:19 -07:00
Brad Warren
93a9e8c836 list 'staple-ocsp' as supported in nginx 2016-09-21 15:48:24 -07:00
Brad Warren
8b553fa88f tie oscp stapling to enhancements system 2016-09-21 15:38:37 -07:00
Brad Warren
307b2e5307 Reject domains with only one label 2016-09-16 16:53:25 -07:00
Brad Warren
275e3f748e filter names returned by get_all_names 2016-09-16 16:47:02 -07:00
Gordin
f1ff5516d1 Fixed hash_bucket_size detection for nginx 2016-08-28 20:29:22 +02:00
Peter Eckersley
7fd249acfe Merge pull request #3383 from certbot/no-conflicting-declarations3 
Avoid importing conflicting security policy directives
 2016-08-18 14:11:49 -07:00
Peter Eckersley
df61b0e349 Check for comments more accurately 2016-08-18 13:56:15 -07:00
Brad Warren
9fd003cd66 Mark the Nginx plugin as alpha 2016-08-17 16:37:01 -07:00
Brad Warren
4e1830b372 hide the nginx plugin 2016-08-17 16:27:23 -07:00
Brad Warren
73fdc08d83 don't hardcode certbot comment 2016-08-16 21:04:28 -07:00
Brad Warren
449487e8cb Catch all pyparsing exceptions 2016-08-16 19:34:16 -07:00
Brad Warren
465aa38143 Revert "Catch all pyparsing exceptions" 
This reverts commit 7fb5cf1cf5.
 2016-08-16 19:33:19 -07:00
Brad Warren
1aa18a3bad Add test to prevent regressing and not copying ssl_options to /etc/letsencrypt 2016-08-16 19:10:57 -07:00
Brad Warren
5ec22438ff Make sure mod_ssl_conf exists so it can be parsed 2016-08-16 19:04:05 -07:00
Brad Warren
971d6d7540 Don't hardcode comment added by Certbot 2016-08-16 18:50:18 -07:00
Brad Warren
76d17bfd0f Avoid modifying parsed ssl_options 2016-08-16 18:40:05 -07:00
Brad Warren
76c2fe579a Make _comment_directive more defensive 2016-08-16 18:30:45 -07:00
Brad Warren
671d7ee194 Fix up COMMENT constants 2016-08-16 17:45:43 -07:00
Brad Warren
3d4f822be0 Handle case where block is empty -- not sure if it ever happens, but let's not error out unnecessarily 2016-08-16 16:41:23 -07:00
Brad Warren
ae23800e53 Comment code that confused bmw 2016-08-16 16:37:40 -07:00
Brad Warren
7fb5cf1cf5 Catch all pyparsing exceptions 2016-08-16 15:46:31 -07:00
Brad Warren
0b0eca323c Remove extra newline 2016-08-16 15:36:41 -07:00
Seth Schoen
cfc8ce9db4 Add function docstring 2016-08-10 17:01:34 -07:00
Peter Eckersley
9c168017ae That was not the correct magic 2016-08-08 18:17:02 -07:00
Peter Eckersley
b5fa0fbad7 This is reportedly the correct magic 2016-08-08 18:08:11 -07:00
Peter Eckersley
712bd9ee6b Copy nginx options file into integration testing environment 2016-08-08 17:58:22 -07:00
Peter Eckersley
0504882e08 Always newline config edits 
Even if they're transient
 2016-08-08 17:50:20 -07:00
Seth Schoen
e77a3ed7b9 Return individual key, not entire config dictionary! 2016-08-08 17:22:53 -07:00
Peter Eckersley
f0c2ed3059 Lint, improve coverage, rm unused code 2016-08-08 15:45:49 -07:00
Peter Eckersley
da7e429125 Work around horrible spaciness API usage bug 2016-08-08 15:14:06 -07:00
Peter Eckersley
7deb1f0ad6 Fix bug with UnpsacedList.insert to final position 
- which only applied when the list actually contained spaces
 2016-08-08 12:15:18 -07:00
Peter Eckersley
0ade03b7bf Merge remote-tracking branch 'origin/master' into no-conflicting-declarations3 2016-08-05 15:41:54 -07:00
Peter Eckersley
460f49778f Fix tests for our new spacey, commented world 2016-08-05 15:37:01 -07:00
Peter Eckersley
cdc894601c Tolerate our own added newlines 2016-08-05 15:36:40 -07:00
Peter Eckersley
3a2df72bce Add newlines to the ends of blocks more correctly 2016-08-05 15:36:24 -07:00
Seth Schoen
ae6ca4d4ca Minimal fake os_constant() for nginx constants.py 2016-08-05 15:13:04 -07:00
Peter Eckersley
a8abde7d8d Merge remote-tracking branch 'origin/no-conflicting-declarations3' into no-conflicting-declarations3 2016-08-05 14:47:41 -07:00
Peter Eckersley
61b81b877d Merge remote-tracking branch 'origin/master' into no-conflicting-declarations3 2016-07-29 17:28:29 -07:00
Peter Eckersley
89758decbb Fix a test 2016-07-29 17:28:22 -07:00
Peter Eckersley
9e9c4dfcf5 fix test 2016-07-27 16:55:23 -07:00
Peter Eckersley
d55580025f Extra newlines & spacing 2016-07-27 16:29:30 -07:00
Peter Eckersley
2feeb50109 Fix spacing of nginx redirect blocks 2016-07-27 16:00:43 -07:00
schoen
94ea424638 Merge pull request #3287 from certbot/nginx-charset-map 
Nginx charset_map and ${VARIABLE_SUBSTITUTION} parsing
 2016-07-27 15:14:15 -07:00
Brad Warren
1060ea7c3d delint 2016-07-26 17:36:58 -07:00
Peter Eckersley
e1f560dca3 Neaten 2016-07-26 17:23:24 -07:00
Brad Warren
4eb38fe167 Make spaced list handle an insert past the end of the list 2016-07-26 17:09:01 -07:00
Brad Warren
f98470d4a0 Revert "UnspacedList._spaced_position: support the slice at the end fo the list" 
This reverts commit 85d9ab4d5c.
 2016-07-26 17:01:24 -07:00
Brad Warren
599ba1194f Merge branch 'master' into no-conflicting-declarations3 2016-07-26 16:47:25 -07:00
Ville Skyttä
c7b89c334b Use logger.warning instead of deprecated warn 2016-07-22 09:54:28 +03:00
Ville Skyttä
86b287b338 Use assertEqual instead of deprecated assertEquals 2016-07-22 09:54:28 +03:00
Peter Eckersley
85d9ab4d5c UnspacedList._spaced_position: support the slice at the end fo the list 
- Which is needed for .insert()ing at the end, for instance.
 2016-07-21 13:39:13 -07:00
Peter Eckersley
e5cb04ee7d A couple of fixes 2016-07-21 13:26:57 -07:00
Brad Warren
2ce5b195e5 check certbot 2016-07-18 18:23:54 -07:00
Brad Warren
ed4fc9d2f7 call _comment_directive 2016-07-18 18:20:21 -07:00
Brad Warren
5dd8f70e56 better newline logic 2016-07-18 18:19:14 -07:00
Brad Warren
bd21325fcd newline logic 2016-07-18 18:12:44 -07:00
Brad Warren
aa33c0fa83 does it work? 2016-07-18 15:33:28 -07:00
Brad Warren
5d7ef49fac _add_directive cleanup 2016-07-18 15:25:09 -07:00
Peter Eckersley
e3ab49a93b Rework "value" parser: 
- Now handles any${VAR_SUBSTITUTION}inthemiddle/of/values
  - Don't use a single giant janky Regex; use small ones and have PyParsing
    combine them
 2016-07-15 17:11:04 -07:00
Peter Eckersley
b6966fc05e lint 2016-07-15 17:11:04 -07:00
Peter Eckersley
7183896ed7 Preserve spaces before comments at the beginning of a file 2016-07-15 17:11:04 -07:00
Brad Warren
dbb2398270 Add _comment_spaced_block 2016-07-15 09:25:12 -07:00
Brad Warren
9c915b0ae4 Fix tests 2016-07-14 18:15:01 -07:00
Brad Warren
6b639679e8 Merge branch 'master' into no-conflicting-declarations 2016-07-14 17:26:39 -07:00
Peter Eckersley
b7cf928852 Parse charset_map correctly 
(though we still don't emit it correctly...)
 2016-07-13 17:17:45 -07:00
Peter Eckersley
68500cd436 Don't allow dollar_var to swalllow characters like "{" 2016-07-09 15:13:09 -07:00
Peter Eckersley
be8f0bc53b Do a better job of parsing map patterns 2016-06-30 15:29:38 -07:00
Peter Eckersley
db8ddac4e2 lint & tweak 2016-06-30 15:13:35 -07:00
Peter Eckersley
8c3e443de9 First attempt at mitigating #3206 2016-06-30 15:07:28 -07:00
schoen
adeb39a7f2 Merge pull request #3218 from certbot/nginx-dirty-write-only 
Only write nginx config files if they've been modified
 2016-06-27 14:07:51 -07:00
schoen
eaf339632a Merge pull request #3184 from certbot/nginx-space-preservation 
Nginx space preservation
 2016-06-27 12:50:34 -07:00
Peter Eckersley
bdbdd826de Extra comment & concision 2016-06-27 12:50:06 -07:00
Peter Eckersley
3e9bf2f35f Tests for UnspacedList.is_dirty() 2016-06-27 12:50:06 -07:00
Peter Eckersley
6017a6cb6d Only write nginx config files if we've modified them 2016-06-27 12:44:36 -07:00
Peter Eckersley
184f54cbc7 cosmetic improvements 2016-06-27 12:36:28 -07:00
Peter Eckersley
fdbb69930b Tweak the NotImplementedError cases 2016-06-27 12:00:41 -07:00
Peter Eckersley
98d261596c Raise NotImplemented for all problematic list methods 2016-06-24 19:16:05 -07:00
Peter Eckersley
0dc4639cbf Be more explicit about range policing 
(rather than doing it in some roundabout crazy way)
 2016-06-24 18:56:30 -07:00
Peter Eckersley
880cb03191 Make assertions about index policing 2016-06-24 18:50:18 -07:00
Peter Eckersley
6a938f2ee7 Fix docstring nit 2016-06-24 16:52:02 -07:00
Peter Eckersley
8f0a5fdc66 Fix a bug in the new index calculations 2016-06-24 16:48:30 -07:00
Peter Eckersley
20b92a3c1f Add some test coverage 2016-06-24 16:48:22 -07:00
Peter Eckersley
9da533d92e Be more succinct 2016-06-24 16:13:12 -07:00
Peter Eckersley
e415a4d402 For now, instead, consider this NotImplemented 2016-06-24 14:36:23 -07:00
Peter Eckersley
ad13b525b2 For reference, a buggy attempt to implement slicing 
but slice assignment seems to mangle the .spaced list in some cases
 2016-06-24 14:35:42 -07:00
Peter Eckersley
6930523c14 Refactor to simplify indenation handling 2016-06-23 17:59:26 -07:00
Peter Eckersley
a29c6e3102 Try simplifying handling of spacey sublists 
- this was causing test failures but they may all have been fixed by other
   changes...
 2016-06-23 14:06:32 -07:00
Peter Eckersley
db66050a7a Make atomicity comment more accurate 2016-06-23 11:41:31 -07:00
Peter Eckersley
4ef7131a4b Name all of nginxparser's magic regexps 2016-06-23 11:06:11 -07:00
Brad Warren
975599e9ca Remove bad save in nginx perform 2016-06-22 18:25:09 -07:00
Peter Eckersley
26fdc4683b Merge remote-tracking branch 'origin/master' into nginx-space-preservation 2016-06-22 16:39:27 -07:00
Peter Eckersley
7ea0ce5a17 Remove warning about nginx options file 
- This would be a security issue if we ran as setuid root at the request of
   non-privileged users, but we don't
 2016-06-21 15:34:26 -07:00
Peter Eckersley
098d23ac98 Comment a couple of things 2016-06-21 15:33:57 -07:00
Peter Eckersley
884b21ffbe fix docstring typo 2016-06-21 15:11:32 -07:00
Peter Eckersley
5960376d36 Cleanups 2016-06-20 18:17:47 -07:00
Peter Eckersley
14ea8d8cdf Fix server_name spaciness 2016-06-20 17:45:02 -07:00
Peter Eckersley
02844904f0 Improve coverage 2016-06-20 16:11:32 -07:00
Peter Eckersley
e2fd1369f3 Update test for fancier semantics 2016-06-20 16:08:40 -07:00
Peter Eckersley
ef31a837f7 Lint 2016-06-20 15:56:19 -07:00
Peter Eckersley
d2b4ae5740 Consistently coerce inbound data to Unspacines 2016-06-18 15:17:59 -07:00
Peter Eckersley
b663ec039e lint 2016-06-18 15:05:48 -07:00
Peter Eckersley
1e59bf8112 fixup 2016-06-18 14:53:17 -07:00
Peter Eckersley
e4f88506cc Fix TLS_SNI & associated tests 2016-06-18 14:52:07 -07:00
Peter Eckersley
7bcc23d9f5 Debugging 2016-06-17 18:30:12 -07:00
Peter Eckersley
679101cfb0 Object printing improvements 2016-06-17 18:29:45 -07:00
Peter Eckersley
b2c36f8527 Lint & test fix 2016-06-17 14:39:55 -07:00
Peter Eckersley
ba0a0e9c26 Tests for UnspacedList 2016-06-17 14:32:24 -07:00
Peter Eckersley
efd1ff46c6 Lint 2016-06-16 18:18:33 -07:00
Peter Eckersley
9459daa6d0 Delete new.conf files after tests 
Not least, to prevent git conflicts with old branches
 2016-06-16 18:04:13 -07:00
Peter Eckersley
da250a4f4b Experimentally delete these output files 2016-06-16 17:59:49 -07:00
Peter Eckersley
e76e3a953a Fix test cases 
- but we're still mangling files in place...
 2016-06-16 17:58:05 -07:00
Peter Eckersley
b82ebd9180 Fix desyncronisation with .spaced when modifying sublists 
- we now actually write directives again!
 2016-06-16 17:17:13 -07:00
Peter Eckersley
72ba5b72cc Try to preserve the exact form of end-of-file whitespace 2016-06-16 12:25:11 -07:00
Peter Eckersley
e5ce03b312 More test wrangling 2016-06-16 12:24:36 -07:00
Peter Eckersley
ff7addefb3 Start fixing tests 2016-06-15 17:57:24 -07:00
Peter Eckersley
2cbd680bd5 Hide .spaced from users outside nginxparser.py 2016-06-15 17:36:53 -07:00
Peter Eckersley
4f46289c1b Start cleanup 2016-06-15 17:26:38 -07:00
Peter Eckersley
5e59b8ad46 Woohoo! it works 2016-06-15 16:42:47 -07:00
Peter Eckersley
98a2e0c6d6 Another waypoint 2016-06-15 16:02:33 -07:00
Peter Eckersley
8147c671e4 Now handles some conf files in whitespace-preserving mode 
(but not all of them)
 2016-06-08 17:52:35 -07:00
Peter Eckersley
44edbecba0 Merge remote-tracking branch 'origin/master' into nginx-space-preservation 2016-06-08 16:55:18 -07:00
Peter Eckersley
443f2ebb58 WIP 2016-06-07 18:19:58 -07:00
Peter Eckersley
80a52d8f01 Vaguely close to working? 2016-06-07 17:55:53 -07:00
Peter Eckersley
9be5f7d7d9 Further WIP 2016-06-07 17:17:17 -07:00
Peter Eckersley
ac220976f1 work in progress 2016-06-07 14:46:49 -07:00
Peter Eckersley
ec49afb7c0 UnspacedList: infrastructure for parsing but hiding nginx whitespace 2016-06-03 16:45:24 -07:00
Brad Warren
36e63a7372 Bump version to 0.9.0 2016-06-02 13:50:37 -07:00
Brad Warren
dcadcf8d42
Release 0.8.0 2016-06-02 13:50:30 -07:00
Peter Eckersley
61e0e3cc83 Merge pull request #3073 from cowlicks/rename-le-util 
Rename certbot.le_util to certbot.util
 2016-05-27 14:37:36 -07:00
Brad Warren
7153220b41 Bump version to 0.8.0 2016-05-27 13:30:54 -07:00
Brad Warren
46d8f6e18c
Release 0.7.0 2016-05-27 13:30:46 -07:00
Blake Griffith
2d121585c9 Catch more le_util in certbot-nginx 2016-05-26 15:51:56 -05:00
Blake Griffith
d9d2377242 Rename certbot.le_util to certbot.util 
Also rename certbot/tests/le_util_test.py to certbot/tests/util_test.py
 2016-05-25 18:50:02 -05:00
Peter Eckersley
d68322f48d Merge pull request #2979 from certbot/nginx-plugin-map 
Nginx plugin map (brings in #2781)
 2016-05-12 18:42:18 -07:00
Peter Eckersley
83703fd8b1 Merge remote-tracking branch 'origin/master' into nginx-plugin-map 2016-05-12 17:51:50 -07:00
Brad Warren
c8cf0b4600 Bump version to 0.7.0 2016-05-11 18:04:27 -07:00
Brad Warren
8e742fa3c6
Release 0.6.0 2016-05-11 18:04:15 -07:00
Brad Warren
0fba79806a Merge remote-tracking branch 'origin/rename' into candidate-0.6.0 2016-05-11 17:22:27 -07:00
Marcel Krüger
762e9e9db0 Fix mime.types parsing for nginx 
Added characters to key parsing rule which appear in the mime type in mime.types.
 2016-05-11 06:16:13 +02:00
Noah Swartz
144f28690b added new docs links 2016-05-04 17:03:52 -07:00
Brad Warren
b956a968c6 this commit was authored by the Certbot Project 2016-04-14 16:56:02 -07:00
Brad Warren
3d248d8a60 s/Let's Encrypt/Certbot certbot-nginx 2016-04-13 16:49:30 -07:00
Brad Warren
a43fac3277 s/letsencrypt/certbot letsencrypt-nginx tests 2016-04-13 16:45:54 -07:00