ouczbs/anki-sync-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor ankiserverctl.py to delegate database operations to SqliteUserManager and use python3 compatible print calls.

Browse Source
This commit is contained in:
Christoph Mack 2016-05-27 21:42:52 +02:00 committed by flan
parent c7d7ff3e85
commit c805468449
1 changed files with 39 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
ankisyncctl.py
View File

@ -1,11 +1,12 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import print_function
import os import os
import sys import sys
import binascii
import getpass import getpass
import hashlib
import sqlite3 from ankisyncd.users import SqliteUserManager
DATAPREFIX = os.path.join(os.path.expanduser("~"), ".local", "share") DATAPREFIX = os.path.join(os.path.expanduser("~"), ".local", "share")
DATADIR = os.path.join(DATAPREFIX, "ankisyncd") DATADIR = os.path.join(DATAPREFIX, "ankisyncd")
@ -13,81 +14,61 @@ AUTHDBPATH = os.path.join(DATADIR, "auth.db")
COLLECTIONPATH = os.path.join(DATADIR, "collections") COLLECTIONPATH = os.path.join(DATADIR, "collections")
def usage(): def usage():
print "usage: "+sys.argv[0]+" <command> [<args>]" print("usage: "+sys.argv[0]+" <command> [<args>]")
print print()
print "Commands:" print("Commands:")
print " adduser <username> - add a new user" print(" adduser <username> - add a new user")
print " deluser <username> - delete a user" print(" deluser <username> - delete a user")
print " lsuser - list users" print(" lsuser - list users")
print " passwd <username> - change password of a user" print(" passwd <username> - change password of a user")
def adduser(username): def adduser(username):
if username: if username:
password = getpass.getpass("Enter password for "+username+": ") password = getpass.getpass("Enter password for {}: ".format(username))
salt = binascii.b2a_hex(os.urandom(8))
hash = hashlib.sha256(username+password+salt).hexdigest()+salt
conn = sqlite3.connect(AUTHDBPATH) user_manager = SqliteUserManager(AUTHDBPATH, COLLECTIONPATH)
cursor = conn.cursor() user_manager.add_user(username, password)
cursor.execute( "CREATE TABLE IF NOT EXISTS auth "
"(user VARCHAR PRIMARY KEY, hash VARCHAR)")
cursor.execute("INSERT INTO auth VALUES (?, ?)", (username, hash))
colpath = os.path.join(COLLECTIONPATH, username)
if not os.path.isdir(colpath):
os.makedirs(colpath)
conn.commit()
conn.close()
else: else:
usage() usage()
def deluser(username): def deluser(username):
if username and os.path.isfile(AUTHDBPATH): if username and os.path.isfile(AUTHDBPATH):
conn = sqlite3.connect(AUTHDBPATH) user_manager = SqliteUserManager(AUTHDBPATH, COLLECTIONPATH)
cursor = conn.cursor()
cursor.execute("DELETE FROM auth WHERE user=?", (username,)) try:
user_manager.del_user(username)
conn.commit() except ValueError as error:
conn.close() print("Could not delete user {}: {}"
.format(username, error.message), file=sys.stderr)
elif not username: elif not username:
usage() usage()
else: else:
print >>sys.stderr, sys.argv[0]+": Database file does not exist" print("{}: Database file does not exist".format(sys.argv[0]),
file=sys.stderr)
def lsuser(): def lsuser():
conn = sqlite3.connect(AUTHDBPATH) user_manager = SqliteUserManager(AUTHDBPATH, COLLECTIONPATH)
cursor = conn.cursor() try:
users = user_manager.user_list()
cursor.execute("SELECT user FROM auth") for username in users:
print(username)
row = cursor.fetchone() except ValueError as error:
print("Could not list users: {}".format(AUTHDBPATH, error.message),
while row is not None: file=sys.stderr)
print row[0]
row = cursor.fetchone()
conn.close()
def passwd(username): def passwd(username):
if os.path.isfile(AUTHDBPATH): if os.path.isfile(AUTHDBPATH):
password = getpass.getpass("Enter password for "+username+": ") password = getpass.getpass("Enter password for {}: ".format(username))
salt = binascii.b2a_hex(os.urandom(8))
hash = hashlib.sha256(username+password+salt).hexdigest()+salt
conn = sqlite3.connect(AUTHDBPATH) user_manager = SqliteUserManager(AUTHDBPATH, COLLECTIONPATH)
cursor = conn.cursor() try:
user_manager.set_password_for_user(username, password)
cursor.execute("UPDATE auth SET hash=? WHERE user=?", (hash, username)) except ValueError as error:
print("Could not set password for user {}: {}"
conn.commit() .format(username, error.message), file=sys.stderr)
conn.close()
else: else:
print >>sys.stderr, sys.argv[0]+": Database file does not exist" print("{}: Database file does not exist".format(sys.argv[0]),
file=sys.stderr)
def main(): def main():
argc = len(sys.argv) argc = len(sys.argv)