[elbe-devel] [PATCH 10/10] elbepack: db: stop creating inital user

[Thomas Weißschuh]

The inital user has no purpose anymore, stop creating it.
This also allows the removal of the user functionality altogether.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh at linutronix.de>
---
 debian/control |  1 -
 elbepack/db.py | 43 +------------------------------------------
 2 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/debian/control b/debian/control
index 3486298cf85b9bec90e748fac358e4c3f82f6bd4..ceaf7e27fc3b537a96e58f1df4a3cc6e288456d6 100644
--- a/debian/control
+++ b/debian/control
@@ -127,7 +127,6 @@ Depends: ${misc:Depends}, ${python3:Depends},
   python3-apt,
   python3-mako,
   python3-parted,
-  python3-passlib,
   python3-sqlalchemy ( << 2),
   python3-debian,
   qemu-user-static,
diff --git a/elbepack/db.py b/elbepack/db.py
index e3855cb7b833f837d2b348604137222ad7ed5d42..6dd75a003820e54454bf75f0ddf39b49a34a37cf 100644
--- a/elbepack/db.py
+++ b/elbepack/db.py
@@ -6,24 +6,15 @@
 import errno
 import glob
 import os
-import warnings
 from contextlib import contextmanager
 from datetime import datetime
 from shutil import copyfile, rmtree
 from threading import Thread
 
-with warnings.catch_warnings():
-    # passlib has code to handle absence of the crypt module and will work just
-    # fine for our usecase without it.
-    warnings.filterwarnings('ignore', "'crypt' is deprecated", DeprecationWarning)
-    from passlib.hash import pbkdf2_sha512
-
 from sqlalchemy import (
     Column,
     DateTime,
     ForeignKey,
-    Integer,
-    Sequence,
     String,
     create_engine,
 )
@@ -521,20 +512,6 @@ class ElbeDB:
                                          'application/octet-stream',
                                          'Pbuilder artifact')
 
-    def add_user(self, name, fullname, password, email):
-
-        pwhash = pbkdf2_sha512.hash(password)
-
-        u = User(name=name,
-                 fullname=fullname,
-                 pwhash=pwhash,
-                 email=email)
-
-        with session_scope(self.session) as s:
-            if s.query(User).filter(User.name == name).count() > 0:
-                raise ElbeDBError(f'user {name} already exists in the database')
-            s.add(u)
-
     @classmethod
     def init_db(cls, name, fullname, password, email):
 
@@ -545,25 +522,7 @@ class ElbeDB:
                 print(str(e))
                 return
 
-        db = ElbeDB()
-
-        try:
-            db.add_user(name, fullname, password, email)
-        except ElbeDBError as e:
-            print(str(e))
-
-
-class User(Base):  # type: ignore
-    __tablename__ = 'users'
-
-    id = Column(Integer, Sequence('article_aid_seq', start=1001, increment=1),
-                primary_key=True)
-
-    name = Column(String, unique=True)
-    fullname = Column(String)
-    pwhash = Column(String)
-    email = Column(String)
-    projects = relationship('Project', backref='owner')
+        ElbeDB()
 
 
 class Project (Base):  # type: ignore

-- 
2.48.1