JPT
/
gpgfs
1
0
Fork 0
Code Issues Pull Requests Activity

GPG does zlib compression by default

This commit is contained in:
Jarno Seppänen 2014-05-18 12:34:46 +03:00
parent ec5ba51f98
commit c6a8ce7daa
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gpgfs.py
View File

@ -34,7 +34,7 @@ def read_index(store, path):
write_index(store, path, root)
log.info('created %s', path)
return root
data = store.get(path)
data = store.get(path, format=gpgstore.FMT_GPG)
buf = StringIO(data)
if buf.read(len(magic)) != magic:
raise IOError, 'index parse error: %s' % path
@ -48,7 +48,7 @@ def write_index(store, path, root):
header = ''
write_atom(buf, header)
write_dict(buf, root)
store.put(buf.getvalue(), path=path)
store.put(buf.getvalue(), path=path, format=gpgstore.FMT_GPG)
def write_dict(fd, dct):
# breadth-first
@ -225,7 +225,8 @@ class GpgFs(LoggingMixIn, Operations):
now = time.time()
encpath = putx('')
parent.children[name] = Entry(mode=mode, encpath=encpath, size=0,
nlink=1, ctime=now, mtime=now)
nlink=1, ctime=now, mtime=now,
encformat=gpgstore.FMT_GPG)
parent.mtime = now
log.debug('new path %s => %s', path, encpath)
self.fd += 1
@ -282,7 +283,7 @@ class GpgFs(LoggingMixIn, Operations):
self.flush(path, 0)
ent = self._find(path)
assert ent.mode & stat.S_IFREG
data = self.store.get(ent.encpath)
data = self.store.get(ent.encpath, format=ent.encformat)
return data[offset:offset + size]
def readdir(self, path, fh):
@ -350,7 +351,7 @@ class GpgFs(LoggingMixIn, Operations):
if length == 0:
buf = ''
else:
buf = self.store.get(ent.encpath)
buf = self.store.get(ent.encpath, format=ent.encformat)
buf = buf[:length]
ent.encpath = putx(buf, ent.encpath)
ent.size = length
@ -380,7 +381,7 @@ class GpgFs(LoggingMixIn, Operations):
if path != self.write_path:
self.flush(self.write_path, None)
ent = self._find(path)
buf = self.store.get(ent.encpath)
buf = self.store.get(ent.encpath, format=ent.encformat)
self.write_buf = [buf]
self.write_len = len(buf)
self.write_path = path

11
gpgstore.py
View File

@ -2,26 +2,27 @@
import os
import gnupg
from binascii import hexlify
import zlib
import errno
import logging
log = logging.getLogger('gpgfs')
FMT_GPG = 0
class GpgStore(object):
def __init__(self, encroot, keyid):
self.encroot = encroot
self.keyid = keyid
self.gpg = gnupg.GPG()
def put(self, data, path=None):
def put(self, data, path=None, format=FMT_GPG):
assert format == FMT_GPG
if not path:
path = hexlify(os.urandom(20))
path = path[:2] + '/' + path[2:]
encdir = self.encroot + '/' + path[:2]
if not os.path.exists(encdir):
os.mkdir(encdir, 0755)
data = zlib.compress(data, 1)
res = self.gpg.encrypt(data, self.keyid, armor=False)
if not res.ok:
log.error("encryption failed (keyid %s), %s: %s",
@ -41,7 +42,8 @@ class GpgStore(object):
log.debug('encrypted %s' % path)
return path
def get(self, path):
def get(self, path, format=FMT_GPG):
assert format == FMT_GPG
try:
data = file(self.encroot + '/' + path).read()
except OSError, err:
@ -53,7 +55,6 @@ class GpgStore(object):
if not res.ok:
log.error("decryption failed, %s: %s", res.status, path)
raise OSError(errno.EIO)
data = zlib.decompress(res.data)
log.debug('decrypted %s' % path)
return data