Revert "users: Add a key for each user"

This reverts commit ab655b6c25393e0e2f6e55ac9939e48fe11aaa86.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index c0a8e4e6969e61f1b016448192c2a4a9147e5572..33dbbb1b262e7738576564e28f4534fe90624593 100644 (file)
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -56,7 +56,7 @@ class Users(base.Object):
 
                return res.count
 
-       async def create(self, name, realname=None):
+       def create(self, name, realname=None):
                # XXX check if username has the correct name
 
                # Check if name is already taken
@@ -64,18 +64,15 @@ class Users(base.Object):
                if user:
                        raise ValueError("Username %s already taken" % name)
 
-               # Generate a new key for this user
-               key = await self.backend.keys.generate(name)
-
                # Create new user
-               user = self._get_user("INSERT INTO users(name, realname, key_id) \
-                       VALUES(%s, %s, %s) RETURNING *", name, realname, key)
+               user = self._get_user("INSERT INTO users(name, realname) \
+                       VALUES(%s, %s) RETURNING *", name, realname)
 
                log.debug("Created user %s" % user.name)
 
                return user
 
-       async def create_from_ldap(self, name):
+       def create_from_ldap(self, name):
                log.debug("Creating user %s from LDAP" % name)
 
                # Get required attributes from LDAP
@@ -83,7 +80,7 @@ class Users(base.Object):
                assert dn
 
                # Create regular user
-               user = await self.create(name, realname=attr["cn"][0])
+               user = self.create(name, realname=attr["cn"][0])
 
                # Add all email addresses and activate them
                for email in attr["mail"]:
@@ -106,13 +103,13 @@ class Users(base.Object):
                        LEFT JOIN users_emails ON users.id = users_emails.user_id \
                        WHERE users_emails.email = %s", email)
 
-       async def find(self, username):
+       def find(self, username):
                # Search for a user object
                user = self.get_by_name(username)
 
                # If not user exists, yet, we can import it from LDAP
                if not user:
-                       user = await self.create_from_ldap(username)
+                       user = self.create_from_ldap(username)
 
                # If we found a user which has been deleted, we won't return it
                if user and user.deleted:
@@ -378,13 +375,6 @@ class User(base.DataObject):
 
                return list(sessions)
 
-       # Key Management
-
-       @lazy_property
-       def key(self):
-               if self.data.key_id:
-                       return self.backend.keys.get_by_id(self.data.key_id)
-
        # Quota
 
        def get_quota(self):

diff --git a/src/database.sql b/src/database.sql
index 29c7cfb7151cac6838fd69ed77bf9aaa0bb11598..e9df88df59fd5760ac4c5ee6993de8ff3ce03d7c 100644 (file)
--- a/src/database.sql
+++ b/src/database.sql
@@ -1321,8 +1321,7 @@ CREATE TABLE public.users (
     registered_at timestamp without time zone DEFAULT now() NOT NULL,
     admin boolean DEFAULT false NOT NULL,
     quota bigint,
-    perms text[] DEFAULT ARRAY[]::text[] NOT NULL,
-    key_id integer NOT NULL
+    perms text[] DEFAULT ARRAY[]::text[] NOT NULL
 );
 
 
@@ -2553,14 +2552,6 @@ ALTER TABLE ONLY public.users_emails
     ADD CONSTRAINT users_emails_user_id FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE;
 
 
---
--- Name: users users_key_id; Type: FK CONSTRAINT; Schema: public; Owner: pakfire
---
-
-ALTER TABLE ONLY public.users
-    ADD CONSTRAINT users_key_id FOREIGN KEY (key_id) REFERENCES public.keys(id);
-
-
 --
 -- PostgreSQL database dump complete
 --

diff --git a/src/web/auth.py b/src/web/auth.py
index 87141183c242d4771706d16e32bdc76e35165a2c..a3166ac6ebd9552c28ab9ed9be32fb69e43e2c25 100644 (file)
--- a/src/web/auth.py
+++ b/src/web/auth.py
@@ -133,7 +133,7 @@ class KerberosAuthMixin(object):
 
 
 class LoginHandler(KerberosAuthMixin, base.BaseHandler):
-       async def get(self):
+       def get(self):
                username = self.get_authenticated_user()
                if not username:
                        # Ask to authenticate
@@ -145,7 +145,7 @@ class LoginHandler(KerberosAuthMixin, base.BaseHandler):
 
                with self.db.transaction():
                        # Otherwise fetch the authenticated user
-                       user = await self.backend.users.find(username)
+                       user = self.backend.users.find(username)
                        if not user:
                                raise tornado.web.HTTPError(500, "Could not find user %s" % username)