ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-07 03:40:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
meejah 2020-10-04 21:54:38 -06:00
parent 774ab72c9d
commit bf45f57b60
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration/test_grid_manager.py
View File

@ -42,7 +42,7 @@ def test_create_certificate(reactor, request):
stdin=gm_config,
)
zara_cert_bytes = yield util.run_tahoe(
reactor, request, "grid-manager", "--config", "-", "sign", "zara",
reactor, request, "grid-manager", "--config", "-", "sign", "zara", "1",
stdin=gm_config,
)
zara_cert = json.loads(zara_cert_bytes)
@ -173,7 +173,7 @@ def test_reject_storage_server(reactor, request, temp_dir, flog_gatherer, port_a
print("inserting certificate")
cert = yield util.run_tahoe(
reactor, request, "grid-manager", "--config", "-", "sign", "storage0",
reactor, request, "grid-manager", "--config", "-", "sign", "storage0", "1",
stdin=gm_config,
)

4
integration/test_servers_of_happiness.py
View File

@ -40,6 +40,6 @@ def test_upload_immutable(reactor, temp_dir, introducer_furl, flog_gatherer, sto
yield proto.done
assert False, "should raise exception"
except util.ProcessFailed as e:
assert "UploadUnhappinessError" in e.output.getvalue()
assert "UploadUnhappinessError" in e.output
assert "shares could be placed on only" in proto.output
assert "shares could be placed on only" in proto.output.getvalue()

27
src/allmydata/scripts/tahoe_grid_manager.py
View File

@ -3,7 +3,7 @@ from __future__ import print_function
import sys
import json
import time
from datetime import datetime
from datetime import datetime, timedelta
from allmydata.scripts.common import BaseOptions
from allmydata.util.abbreviate import abbreviate_time
@ -81,15 +81,22 @@ class SignOptions(BaseOptions):
)
def getSynopsis(self):
return "{} NAME".format(super(SignOptions, self).getSynopsis())
return "{} NAME EXPIRY_DAYS".format(super(SignOptions, self).getSynopsis())
def parseArgs(self, *args, **kw):
BaseOptions.parseArgs(self, **kw)
if len(args) != 1:
if len(args) != 2:
raise usage.UsageError(
"Requires one argument: name"
"Requires two arguments: name expiry_days"
)
self['name'] = unicode(args[0])
self['expiry_days'] = int(args[1])
if self['expiry_days'] < 1 or self['expiry_days'] > 20*365:
raise usage.UsageError(
"Certificate expires in an unreasonable number of days: {}".format(
self['expiry_days'],
)
)
class GridManagerOptions(BaseOptions):
@ -236,15 +243,17 @@ class _GridManager(object):
def public_identity(self):
return ed25519.string_from_verifying_key(self._public_key)
def sign(self, name):
def sign(self, name, expiry_seconds):
try:
srv = self._storage_servers[name]
except KeyError:
raise KeyError(
u"No storage server named '{}'".format(name)
)
expiration = datetime.utcnow() + timedelta(seconds=expiry_seconds)
epoch_offset = (expiration - datetime(1970, 1, 1)).total_seconds()
cert_info = {
"expires": int(time.time() + 86400), # XXX FIXME
"expires": epoch_offset,
"public_key": srv.public_key(),
"version": 1,
}
@ -422,7 +431,7 @@ def _list(gridoptions, options):
while fp.child('{}.cert.{}'.format(name, cert_count)).exists():
container = json.load(fp.child('{}.cert.{}'.format(name, cert_count)).open('r'))
cert_data = json.loads(container['certificate'])
expires = datetime.fromtimestamp(cert_data['expires'])
expires = datetime.utcfromtimestamp(cert_data['expires'])
delta = datetime.utcnow() - expires
if delta.total_seconds() < 0:
print("{}: cert {}: valid until {} ({})".format(name, cert_count, expires, abbreviate_time(delta)))
@ -439,8 +448,10 @@ def _sign(gridoptions, options):
fp = FilePath(gm_config) if gm_config.strip() != '-' else None
gm = _load_gridmanager_config(gm_config)
expiry_seconds = int(options['expiry_days']) * 86400
try:
certificate = gm.sign(options['name'])
certificate = gm.sign(options['name'], expiry_seconds)
except KeyError:
raise usage.UsageError(
"No storage-server called '{}' exists".format(options['name'])