mirror of
https://github.com/certbot/certbot.git
synced 2026-01-23 07:20:55 +03:00
7dc64e0387
Save accounts to:
/etc/letsencrypt/accounts/www.letsencrypt-dmeo.org/acme/new-reg/ \
kuba.le.wtf@2015-07-04T14:04:10Z/ \
{regr.json,meta.json,private_key.json}
Account now represents a combination of private key, Registration
Resource and client account metadata. `Account.id` based on the
account metadata (creation host and datetime). UI interface
(`cli._determine_account`) based on the `id`, and not on email as
previously.
Add `AccountStorage` interface and `AccountFileStorage`,
`AccountMemoryStorage` implementations (latter, in-memory, useful for
testing).
Create Account only after Registration Resource is received
(`register()` returns `Account`).
Allow `client.Client(..., acme=acme, ...)`: API client might reuse
acme.client.Client as returned by `register()`.
Move report_new_account to letsencrypt.account, client.Client.register
into client.register.
Use Registration.from_data acme API.
achallenges.AChallenge.key is now the `acme.jose.JWK`, not
`le_util.Key`. Plugins have to export PEM/DER as necessary
(c.f. `letsencrypt.plugins.common.Dvsni.get_key_path`)
Add --agree-tos, save --agree-eula to "args.eula". Prompt for EULA as
soon as client is launched, add prompt for TOS.
Remove unnecessary letsencrypt.network. Remove, now irrelevant,
`IConfig.account_keys_dir`.
Based on the draft from
https://github.com/letsencrypt/letsencrypt/pull/362#issuecomment-97946817.
78 lines
3.0 KiB
Python
78 lines
3.0 KiB
Python
"""Tests for letsencrypt.configuration."""
|
|
import os
|
|
import unittest
|
|
|
|
import mock
|
|
|
|
|
|
class NamespaceConfigTest(unittest.TestCase):
|
|
"""Tests for letsencrypt.configuration.NamespaceConfig."""
|
|
|
|
def setUp(self):
|
|
self.namespace = mock.MagicMock(
|
|
config_dir='/tmp/config', work_dir='/tmp/foo', foo='bar',
|
|
server='https://acme-server.org:443/new')
|
|
from letsencrypt.configuration import NamespaceConfig
|
|
self.config = NamespaceConfig(self.namespace)
|
|
|
|
def test_proxy_getattr(self):
|
|
self.assertEqual(self.config.foo, 'bar')
|
|
self.assertEqual(self.config.work_dir, '/tmp/foo')
|
|
|
|
def test_server_path(self):
|
|
self.assertEqual(['acme-server.org:443', 'new'],
|
|
self.config.server_path.split(os.path.sep))
|
|
|
|
self.namespace.server = ('http://user:pass@acme.server:443'
|
|
'/p/a/t/h;parameters?query#fragment')
|
|
self.assertEqual(['user:pass@acme.server:443', 'p', 'a', 't', 'h'],
|
|
self.config.server_path.split(os.path.sep))
|
|
|
|
@mock.patch('letsencrypt.configuration.constants')
|
|
def test_dynamic_dirs(self, constants):
|
|
constants.ACCOUNTS_DIR = 'acc'
|
|
constants.BACKUP_DIR = 'backups'
|
|
constants.CERT_KEY_BACKUP_DIR = 'c/'
|
|
constants.CERT_DIR = 'certs'
|
|
constants.IN_PROGRESS_DIR = '../p'
|
|
constants.KEY_DIR = 'keys'
|
|
constants.REC_TOKEN_DIR = '/r'
|
|
constants.TEMP_CHECKPOINT_DIR = 't'
|
|
|
|
self.assertEqual(
|
|
self.config.accounts_dir, '/tmp/config/acc/acme-server.org:443/new')
|
|
self.assertEqual(self.config.backup_dir, '/tmp/foo/backups')
|
|
self.assertEqual(self.config.cert_dir, '/tmp/config/certs')
|
|
self.assertEqual(
|
|
self.config.cert_key_backup, '/tmp/foo/c/acme-server.org:443/new')
|
|
self.assertEqual(self.config.in_progress_dir, '/tmp/foo/../p')
|
|
self.assertEqual(self.config.key_dir, '/tmp/config/keys')
|
|
self.assertEqual(self.config.rec_token_dir, '/r')
|
|
self.assertEqual(self.config.temp_checkpoint_dir, '/tmp/foo/t')
|
|
|
|
|
|
class RenewerConfigurationTest(unittest.TestCase):
|
|
"""Test for letsencrypt.configuration.RenewerConfiguration."""
|
|
|
|
def setUp(self):
|
|
self.namespace = mock.MagicMock(config_dir='/tmp/config')
|
|
from letsencrypt.configuration import RenewerConfiguration
|
|
self.config = RenewerConfiguration(self.namespace)
|
|
|
|
@mock.patch('letsencrypt.configuration.constants')
|
|
def test_dynamic_dirs(self, constants):
|
|
constants.ARCHIVE_DIR = "a"
|
|
constants.LIVE_DIR = 'l'
|
|
constants.RENEWAL_CONFIGS_DIR = "renewal_configs"
|
|
constants.RENEWER_CONFIG_FILENAME = 'r.conf'
|
|
|
|
self.assertEqual(self.config.archive_dir, '/tmp/config/a')
|
|
self.assertEqual(self.config.live_dir, '/tmp/config/l')
|
|
self.assertEqual(
|
|
self.config.renewal_configs_dir, '/tmp/config/renewal_configs')
|
|
self.assertEqual(self.config.renewer_config_file, '/tmp/config/r.conf')
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main() # pragma: no cover
|