Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix cross-platform db issue #431

Closed
wants to merge 5 commits into from
Closed

fix cross-platform db issue #431

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
767ced2
fix cross-platform db issue
kavigupta Jul 15, 2020
9aa997e
fix
kavigupta Jul 16, 2020
3e74bbc
add test
kavigupta Jul 16, 2020
691859d
Merge branch 'master' into cross-platform-db-fix
kavigupta Jul 16, 2020
f0c3faa
fix test
kavigupta Jul 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions client/utils/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import os
import ctypes
import shelve # persistance
import hmac # security
Expand Down Expand Up @@ -30,22 +31,30 @@ def mac(value):
mac.update(repr(value).encode('utf-8'))
return mac.hexdigest()

def open_db():
try:
return shelve.open(SHELVE_FILE)
except:
os.unlink(SHELVE_FILE)
return shelve.open(SHELVE_FILE)


def contains(root, key):
key = '{}-{}'.format(root, key)
with shelve.open(SHELVE_FILE) as db:
with open_db() as db:
return key in db

def store(root, key, value):
key = '{}-{}'.format(root, key)
with shelve.open(SHELVE_FILE) as db:
with open_db() as db:
db[key] = {'value': value, 'mac': mac(value)}
return value

def get(root, key, default=None):
if not contains(root, key):
return default
key = '{}-{}'.format(root, key)
with shelve.open(SHELVE_FILE) as db:
with open_db() as db:
data = db[key]
if not hmac.compare_digest(data['mac'], mac(data['value'])):
raise ProtocolException('{} was tampered. Reverse changes, or redownload assignment'.format(SHELVE_FILE))
Expand Down