starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-07-30 16:14:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support quoted server names in Nginx (#5811)

Browse Source 
* Support quoted server names in Nginx

* add unit test to check that we strip quotes

* update configurator test
This commit is contained in:
ohemorange
2018-04-03 12:14:23 -07:00
committed by GitHub
parent f5ad08047b
commit bdaccb645b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot-nginx/certbot_nginx/parser.py
+1 -1
View File
@@ -743,7 +743,7 @@ def _parse_server_raw(server):
if addr.ssl: if addr.ssl:
parsed_server['ssl'] = True parsed_server['ssl'] = True
elif directive[0] == 'server_name': elif directive[0] == 'server_name':
parsed_server['names'].update(directive[1:]) parsed_server['names'].update(x.strip('"\'') for x in directive[1:])
elif _is_ssl_on_directive(directive): elif _is_ssl_on_directive(directive):
parsed_server['ssl'] = True parsed_server['ssl'] = True
apply_ssl_to_all_addrs = True apply_ssl_to_all_addrs = True
certbot-nginx/certbot_nginx/tests/configurator_test.py
+1 -1
View File
@@ -639,7 +639,7 @@ class NginxConfiguratorTest(util.NginxTest):
self.assertEqual([[['server'], self.assertEqual([[['server'],
[['listen', 'myhost', 'default_server'], [['listen', 'myhost', 'default_server'],
['listen', 'otherhost', 'default_server'], ['listen', 'otherhost', 'default_server'],
['server_name', 'www.example.org'], ['server_name', '"www.example.org"'],
[['location', '/'], [['location', '/'],
[['root', 'html'], [['root', 'html'],
['index', 'index.html', 'index.htm']]]]], ['index', 'index.html', 'index.htm']]]]],
certbot-nginx/certbot_nginx/tests/testdata/etc_nginx/sites-enabled/default
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
server { server {
listen myhost default_server; listen myhost default_server;
listen otherhost default_server; listen otherhost default_server;
server_name www.example.org; server_name "www.example.org";
location / { location / {
root html; root html;