[elbe-devel] [PATCH 08/10] elbepack: soap: stop logging in

[Thomas Weißschuh]

The usermanagement is going away, therefore logging in is pointless.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh at linutronix.de>
---
 elbepack/config.py             | 17 +++--------------
 elbepack/daemons/soap/esoap.py |  7 -------
 elbepack/db.py                 | 15 ---------------
 elbepack/soapclient.py         | 10 ++--------
 4 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/elbepack/config.py b/elbepack/config.py
index 4643a5371198d6b5bac38a8a202e3d87bb51d8d4..4259d9b4fc7c67b7626ddb1a73dd7eaccc0d3fe3 100644
--- a/elbepack/config.py
+++ b/elbepack/config.py
@@ -4,7 +4,7 @@
 
 import os
 
-from elbepack.cli import add_argument
+from elbepack.cli import add_argument, add_deprecated_argparse_argument
 
 
 def add_argument_soaptimeout(parser_or_func):
@@ -36,19 +36,8 @@ def add_arguments_soapclient(parser_or_func):
     parser_or_func = add_argument_soapport(parser_or_func)
     parser_or_func = add_argument_soaptimeout(parser_or_func)
 
-    parser_or_func = add_argument(
-        parser_or_func,
-        '--user',
-        dest='soapuser',
-        default=os.environ.get('ELBE_USER', 'root'),
-    )
-
-    parser_or_func = add_argument(
-        parser_or_func,
-        '--pass',
-        dest='soappassword',
-        default=os.environ.get('ELBE_USER', 'foo'),
-    )
+    parser_or_func = add_deprecated_argparse_argument(parser_or_func, '--user', nargs=1)
+    parser_or_func = add_deprecated_argparse_argument(parser_or_func, '--pass', nargs=1)
 
     parser_or_func = add_argument(
         parser_or_func,
diff --git a/elbepack/daemons/soap/esoap.py b/elbepack/daemons/soap/esoap.py
index 3a86d8688659ecafc58821da3e3ebacbd619d901..c770b770f9179190cdb3650bbe3386d293042ce7 100644
--- a/elbepack/daemons/soap/esoap.py
+++ b/elbepack/daemons/soap/esoap.py
@@ -84,13 +84,6 @@ class ESoap (ServiceBase):
     def get_version(self):
         return elbe_version
 
-    @rpc(String, String, _returns=Boolean)
-    def login(self, user, passwd):
-        s = self.transport.req_env['beaker.session']
-        s['userid'] = self.app.pm.db.validate_login(user, passwd)
-        s.save()
-        return True
-
     @rpc(_returns=Array(SoapProject))
     def list_projects(self):
         return self.app.pm.db.list_projects()
diff --git a/elbepack/db.py b/elbepack/db.py
index 701c5d839fe1b2f7dc0828fef7aa2cdbbc2157f4..e3855cb7b833f837d2b348604137222ad7ed5d42 100644
--- a/elbepack/db.py
+++ b/elbepack/db.py
@@ -535,21 +535,6 @@ class ElbeDB:
                 raise ElbeDBError(f'user {name} already exists in the database')
             s.add(u)
 
-    def validate_login(self, name, password):
-        with session_scope(self.session) as s:
-            # Find the user with the given name
-            try:
-                u = s.query(User).filter(User.name == name).one()
-            except NoResultFound:
-                raise InvalidLogin()
-
-            # Check password, throw an exception if invalid
-            if not pbkdf2_sha512.verify(password, u.pwhash):
-                raise InvalidLogin()
-
-            # Everything good, now return the user id to the caller
-            return int(u.id)
-
     @classmethod
     def init_db(cls, name, fullname, password, email):
 
diff --git a/elbepack/soapclient.py b/elbepack/soapclient.py
index f3736fbd886f6d6e8674338684a275a393be6c2c..0862a2cdda5a14fdc48213635c75d84201644b81 100644
--- a/elbepack/soapclient.py
+++ b/elbepack/soapclient.py
@@ -38,14 +38,12 @@ class ElbeVersionMismatch(RuntimeError):
 
 
 class ElbeSoapClient:
-    def __init__(self, host, port, user, passwd, timeout, retries=10):
+    def __init__(self, host, port, timeout, retries=10):
 
         # Attributes
         self._wsdl = 'http://' + host + ':' + str(port) + '/soap/?wsdl'
         self._timeout = timeout
         self._retries = retries
-        self._user = user
-        self._passwd = passwd
         self.host = host
         self.port = port
 
@@ -66,9 +64,6 @@ class ElbeSoapClient:
 
         ElbeVersionMismatch.check(elbe_version, control.service.get_version())
 
-        # We have a Connection, now login
-        control.service.login(self._user, self._passwd)
-
         return control.service
 
     def connect(self):
@@ -77,8 +72,7 @@ class ElbeSoapClient:
 
     @classmethod
     def from_args(cls, args):
-        return cls(args.soaphost, args.soapport, args.soapuser, args.soappassword,
-                   args.soaptimeout, retries=args.retries)
+        return cls(args.soaphost, args.soapport, args.soaptimeout, retries=args.retries)
 
     def _file_download_url(self, builddir, filename):
         return f'http://{self.host}:{self.port}/repo/{builddir}/{filename}'

-- 
2.48.1