starred/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 02:35:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ManualAuthenticator -> Authenticator"

Browse Source 
This reverts commit 81f0a973a3.

This was breaking the client.  Not sure if/how it passed any tests?
This commit is contained in:
Peter Eckersley
2015-09-26 17:48:45 -07:00
parent a21bb67ede
commit 6f1b1570b1
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/plugins/manual.py
+2 -2
View File
@@ -23,7 +23,7 @@ from letsencrypt.plugins import common
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class Authenticator(common.Plugin): class ManualAuthenticator(common.Plugin):
"""Manual Authenticator. """Manual Authenticator.
.. todo:: Support for `~.challenges.DVSNI`. .. todo:: Support for `~.challenges.DVSNI`.
@@ -87,7 +87,7 @@ s.serve_forever()" """
""" """
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(Authenticator, self).__init__(*args, **kwargs) super(ManualAuthenticator, self).__init__(*args, **kwargs)
self.template = (self.HTTP_TEMPLATE if self.config.no_simple_http_tls self.template = (self.HTTP_TEMPLATE if self.config.no_simple_http_tls
else self.HTTPS_TEMPLATE) else self.HTTPS_TEMPLATE)
self._root = (tempfile.mkdtemp() if self.conf("test-mode") self._root = (tempfile.mkdtemp() if self.conf("test-mode")
letsencrypt/plugins/manual_test.py
+5 -5
View File
@@ -17,22 +17,22 @@ from letsencrypt.tests import test_util
KEY = jose.JWKRSA.load(test_util.load_vector("rsa512_key.pem")) KEY = jose.JWKRSA.load(test_util.load_vector("rsa512_key.pem"))
class AuthenticatorTest(unittest.TestCase): class ManualAuthenticatorTest(unittest.TestCase):
"""Tests for letsencrypt.plugins.manual.Authenticator.""" """Tests for letsencrypt.plugins.manual.ManualAuthenticator."""
def setUp(self): def setUp(self):
from letsencrypt.plugins.manual import Authenticator from letsencrypt.plugins.manual import ManualAuthenticator
self.config = mock.MagicMock( self.config = mock.MagicMock(
no_simple_http_tls=True, simple_http_port=4430, no_simple_http_tls=True, simple_http_port=4430,
manual_test_mode=False) manual_test_mode=False)
self.auth = Authenticator(config=self.config, name="manual") self.auth = ManualAuthenticator(config=self.config, name="manual")
self.achalls = [achallenges.SimpleHTTP( self.achalls = [achallenges.SimpleHTTP(
challb=acme_util.SIMPLE_HTTP_P, domain="foo.com", account_key=KEY)] challb=acme_util.SIMPLE_HTTP_P, domain="foo.com", account_key=KEY)]
config_test_mode = mock.MagicMock( config_test_mode = mock.MagicMock(
no_simple_http_tls=True, simple_http_port=4430, no_simple_http_tls=True, simple_http_port=4430,
manual_test_mode=True) manual_test_mode=True)
self.auth_test_mode = Authenticator( self.auth_test_mode = ManualAuthenticator(
config=config_test_mode, name="manual") config=config_test_mode, name="manual")
def test_more_info(self): def test_more_info(self):
setup.py
+1 -1
View File
@@ -117,7 +117,7 @@ setup(
'letsencrypt-renewer = letsencrypt.renewer:main', 'letsencrypt-renewer = letsencrypt.renewer:main',
], ],
'letsencrypt.plugins': [ 'letsencrypt.plugins': [
'manual = letsencrypt.plugins.manual:Authenticator', 'manual = letsencrypt.plugins.manual:ManualAuthenticator',
# TODO: null should probably not be presented to the user # TODO: null should probably not be presented to the user
'null = letsencrypt.plugins.null:Installer', 'null = letsencrypt.plugins.null:Installer',
'standalone = letsencrypt.plugins.standalone.authenticator' 'standalone = letsencrypt.plugins.standalone.authenticator'