Pakfire October 2017

pakfire@lists.ipfire.org

1 participants
5 discussions

[PATCH] Add possibility to login via email address
by Jonatan Schlag 29 Oct '17

29 Oct '17

This patch to login via email address for normal users and for ldap users. This is for ldap user also possible on the the first login. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/buildservice/ldap.py | 30 ++++++++++++++++++++++++++---- src/buildservice/users.py | 19 ++++++++++++------- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/src/buildservice/ldap.py b/src/buildservice/ldap.py index 9f5019e..44f7c7c 100644 --- a/src/buildservice/ldap.py +++ b/src/buildservice/ldap.py @@ -34,9 +34,9 @@ class LDAP(base.Object): def auth(self, username, password): log.debug("Checking credentials for %s" % username) - dn = self.get_dn_by_uid(username) + dn = self.get_dn(username) if not dn: - log.debug("Could not resolve username %s to dn" % username) + log.debug("Could not resolve %s to dn" % username) return False return self.bind(dn, password) @@ -61,9 +61,31 @@ class LDAP(base.Object): log.debug("DN for uid %s is: %s" % (uid, dn)) return dn - def get_user(self, uid, **kwargs): + def get_dn_by_mail(self, mail): + result = self.search("(&(objectClass=posixAccount)(mail=%s))" % mail, limit=1, attrlist=["uid"]) + + for dn, attrs in result: + return dn + + log.debug("DN for mail %s is: %s" % (mail, dn)) + return None + + def get_dn(self, name): + return self.get_dn_by_uid(name) or self.get_dn_by_mail(name) + + def get_user_by_mail(self, mail, **kwargs): + result = self.search("(&(objectClass=posixAccount)(mail=%s))" % mail, limit=1, **kwargs) + for dn, attrs in result: + return (dn, attrs) + + return None + + def get_user_by_dn(self, uid, **kwargs): result = self.search("(&(objectClass=posixAccount)(uid=%s))" % uid, limit=1, **kwargs) for dn, attrs in result: return (dn, attrs) - return (None, None) \ No newline at end of file + return None + + def get_user(self, name, **kwargs): + return self.get_user_by_dn(name, **kwargs) or self.get_user_by_mail(name, **kwargs) diff --git a/src/buildservice/users.py b/src/buildservice/users.py index 8d731d8..005a2e0 100644 --- a/src/buildservice/users.py +++ b/src/buildservice/users.py @@ -150,20 +150,21 @@ class Users(base.Object): if None in (name, password): return - # Search for the username in the database. - # The user must not be deleted and must be activated. - user = self._get_user("SELECT * FROM users WHERE name = %s AND \ - activated IS TRUE AND deleted IS FALSE", name) + # usually we will get an email address as name + user = self.get_by_email(name) or self.get_by_name(name) - # If no user could be found, we search for a matching user in - # the LDAP database if not user: + # If no user could be found, we search for a matching user in + # the LDAP database if not self.ldap.auth(name, password): return # If a LDAP user is found (and password matches), we will # create a new local user with the information from LDAP. - user = self.register_from_ldap(name) + user = self.create_from_ldap(name) + + if not user.activated or user.deleted: + return # Check if the password matches if user.check_password(password): @@ -416,6 +417,10 @@ class User(base.DataObject): return self.data.activated @property + def deleted(self): + return self.data.deleted + + @property def registered(self): return self.data.registered -- 2.11.0

1 0

[PATCH] Allow it to create a user without specifying a password
by Jonatan Schlag 23 Oct '17

23 Oct '17

This is useful when we implement authentication against LDAP. Fixes: #11517 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/buildservice/users.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/buildservice/users.py b/src/buildservice/users.py index 8af92d7..50c44af 100644 --- a/src/buildservice/users.py +++ b/src/buildservice/users.py @@ -132,7 +132,9 @@ class Users(base.Object): return user def register(self, name, password, email, realname, locale=None): - return User.new(self.pakfire, name, password, email, realname, locale) + user = User.new(self.pakfire, name, email, realname, locale) + user.passphrase = password + return user def name_is_used(self, name): users = self.db.query("SELECT id FROM users WHERE name = %s", name) @@ -241,9 +243,9 @@ class User(base.Object): return cmp(self.realname, other.realname) @classmethod - def new(cls, pakfire, name, passphrase, email, realname, locale=None): - id = pakfire.db.execute("INSERT INTO users(name, passphrase, realname) \ - VALUES(%s, %s, %s)", name, generate_password_hash(passphrase), realname) + def new(cls, pakfire, name , email, realname, locale=None): + id = pakfire.db.execute("INSERT INTO users(name, realname) \ + VALUES(%s, %s)", name, realname) # Add email address. pakfire.db.execute("INSERT INTO users_emails(user_id, email, primary) \ -- 2.11.0

1 0

[PATCH 1/3] Load configurations only if the config file exists
by Jonatan Schlag 10 Oct '17

10 Oct '17

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/buildservice/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/buildservice/__init__.py b/src/buildservice/__init__.py index be81ba0..9619bfe 100644 --- a/src/buildservice/__init__.py +++ b/src/buildservice/__init__.py @@ -84,8 +84,11 @@ class Backend(object): # Load all configuration files for path in paths: - log.debug("Loading configuration from %s" % path) - c.read(path) + if os.path.exists(path): + log.debug("Loading configuration from %s" % path) + c.read(path) + else: + log.error("No such file %s" % path) return c -- 2.11.0

1 2

[PATCH] Add a Dockerfile
by Jonatan Schlag 06 Oct '17

06 Oct '17

To create a container for our pbs service we add a Docker image based on ipfire/pakfire:latest. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- Dockerfile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..4665311 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,27 @@ +FROM ipfire/pakfire:latest +MAINTAINER jonatanschlag + +RUN yum update -y && \ + yum install -y epel-release && \ + yum install -y python python-tornado python-daemon python-psycopg2 pytz-2016.10 python-memcached python-textile && \ + groupadd -g 2000 pbs && \ + useradd --system --no-create-home --shell /bin/bash --uid 2000 --gid 2000 pbs && \ + yum autoremove -y && \ + yum clean all && \ + rm -rf /var/tmp/* /var/cache/yum/* /opt/dev/* && \ + mkdir -p /opt/pbs + +COPY . /opt/pbs + +RUN chown -R pbs:pbs /opt/pbs && \ + chmod +x /opt/pbs/pakfire-web && \ + chmod +x /opt/pbs/pakfire-hub && \ + chmod +x /opt/pbs/pakfire-manager + +WORKDIR /opt/pbs + +USER pbs + +# Define default command. +CMD ["/bin/bash"] + -- 2.11.0

1 0

[PATCH] Add a Dockerfile
by Jonatan Schlag 06 Oct '17

06 Oct '17

1 0

2024

2023

2022

2021

2020

2019

2018

2017

Pakfire October 2017