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

Dummy use of network2 in revoker

Browse Source
This commit is contained in:
Jakub Warmuz
2015-06-22 04:52:07 +00:00
parent e503601d3b
commit 960b070c22
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/revoker.py
+7 -7
View File
@@ -16,12 +16,11 @@ import tempfile
import Crypto.PublicKey.RSA import Crypto.PublicKey.RSA
import M2Crypto import M2Crypto
from acme import messages
from acme.jose import util as jose_util from acme.jose import util as jose_util
from letsencrypt import errors from letsencrypt import errors
from letsencrypt import le_util from letsencrypt import le_util
from letsencrypt import network from letsencrypt import network2
from letsencrypt.display import util as display_util from letsencrypt.display import util as display_util
from letsencrypt.display import revocation from letsencrypt.display import revocation
@@ -45,7 +44,9 @@ class Revoker(object):
""" """
def __init__(self, installer, config, no_confirm=False): def __init__(self, installer, config, no_confirm=False):
self.network = network.Network(config.server) # XXX
self.network = network2.Network(new_reg_uri=None, key=None, alg=None)
self.installer = installer self.installer = installer
self.config = config self.config = config
self.no_confirm = no_confirm self.no_confirm = no_confirm
@@ -238,6 +239,8 @@ class Revoker(object):
:returns: TODO :returns: TODO
""" """
# XXX | pylint: disable=unused-variable
# These will both have to change in the future away from M2Crypto # These will both have to change in the future away from M2Crypto
# pylint: disable=protected-access # pylint: disable=protected-access
certificate = jose_util.ComparableX509(cert._cert) certificate = jose_util.ComparableX509(cert._cert)
@@ -250,10 +253,7 @@ class Revoker(object):
raise errors.LetsEncryptRevokerError( raise errors.LetsEncryptRevokerError(
"Corrupted backup key file: %s" % cert.backup_key_path) "Corrupted backup key file: %s" % cert.backup_key_path)
# TODO: Catch error associated with already revoked and proceed. return self.network.revoke(certr=None) # XXX
return self.network.send_and_receive_expected(
messages.RevocationRequest.create(certificate=certificate, key=key),
messages.Revocation)
def _remove_certs_keys(self, cert_list): # pylint: disable=no-self-use def _remove_certs_keys(self, cert_list): # pylint: disable=no-self-use
"""Remove certificate and key. """Remove certificate and key.
letsencrypt/tests/revoker_test.py
+6 -6
View File
@@ -63,7 +63,7 @@ class RevokerTest(RevokerBase):
def tearDown(self): def tearDown(self):
shutil.rmtree(self.backup_dir) shutil.rmtree(self.backup_dir)
@mock.patch("letsencrypt.revoker.network.Network.send_and_receive_expected") @mock.patch("letsencrypt.network2.Network.revoke")
@mock.patch("letsencrypt.revoker.revocation") @mock.patch("letsencrypt.revoker.revocation")
def test_revoke_by_key_all(self, mock_display, mock_net): def test_revoke_by_key_all(self, mock_display, mock_net):
mock_display().confirm_revocation.return_value = True mock_display().confirm_revocation.return_value = True
@@ -89,7 +89,7 @@ class RevokerTest(RevokerBase):
self.revoker.revoke_from_key, self.revoker.revoke_from_key,
self.key) self.key)
@mock.patch("letsencrypt.revoker.network.Network.send_and_receive_expected") @mock.patch("letsencrypt.network2.Network.revoke")
@mock.patch("letsencrypt.revoker.revocation") @mock.patch("letsencrypt.revoker.revocation")
def test_revoke_by_wrong_key(self, mock_display, mock_net): def test_revoke_by_wrong_key(self, mock_display, mock_net):
mock_display().confirm_revocation.return_value = True mock_display().confirm_revocation.return_value = True
@@ -105,7 +105,7 @@ class RevokerTest(RevokerBase):
# No revocation went through # No revocation went through
self.assertEqual(mock_net.call_count, 0) self.assertEqual(mock_net.call_count, 0)
@mock.patch("letsencrypt.revoker.network.Network.send_and_receive_expected") @mock.patch("letsencrypt.network2.Network.revoke")
@mock.patch("letsencrypt.revoker.revocation") @mock.patch("letsencrypt.revoker.revocation")
def test_revoke_by_cert(self, mock_display, mock_net): def test_revoke_by_cert(self, mock_display, mock_net):
mock_display().confirm_revocation.return_value = True mock_display().confirm_revocation.return_value = True
@@ -122,7 +122,7 @@ class RevokerTest(RevokerBase):
self.assertEqual(mock_net.call_count, 1) self.assertEqual(mock_net.call_count, 1)
@mock.patch("letsencrypt.revoker.network.Network.send_and_receive_expected") @mock.patch("letsencrypt.network2.Network.revoke")
@mock.patch("letsencrypt.revoker.revocation") @mock.patch("letsencrypt.revoker.revocation")
def test_revoke_by_cert_not_found(self, mock_display, mock_net): def test_revoke_by_cert_not_found(self, mock_display, mock_net):
mock_display().confirm_revocation.return_value = True mock_display().confirm_revocation.return_value = True
@@ -141,7 +141,7 @@ class RevokerTest(RevokerBase):
self.assertEqual(mock_net.call_count, 1) self.assertEqual(mock_net.call_count, 1)
@mock.patch("letsencrypt.revoker.network.Network.send_and_receive_expected") @mock.patch("letsencrypt.network2.Network.revoke")
@mock.patch("letsencrypt.revoker.revocation") @mock.patch("letsencrypt.revoker.revocation")
def test_revoke_by_menu(self, mock_display, mock_net): def test_revoke_by_menu(self, mock_display, mock_net):
mock_display().confirm_revocation.return_value = True mock_display().confirm_revocation.return_value = True
@@ -165,7 +165,7 @@ class RevokerTest(RevokerBase):
self.assertEqual(mock_display.more_info_cert.call_count, 1) self.assertEqual(mock_display.more_info_cert.call_count, 1)
@mock.patch("letsencrypt.revoker.logging") @mock.patch("letsencrypt.revoker.logging")
@mock.patch("letsencrypt.revoker.network.Network.send_and_receive_expected") @mock.patch("letsencrypt.network2.Network.revoke")
@mock.patch("letsencrypt.revoker.revocation") @mock.patch("letsencrypt.revoker.revocation")
def test_revoke_by_menu_delete_all(self, mock_display, mock_net, mock_log): def test_revoke_by_menu_delete_all(self, mock_display, mock_net, mock_log):
mock_display().confirm_revocation.return_value = True mock_display().confirm_revocation.return_value = True