From c8c1ca3c97cd4e6f52a7e2476a0000180d869aab Mon Sep 17 00:00:00 2001 From: Lev-Arcady Sellem Date: Sun, 25 Mar 2018 19:16:05 +0200 Subject: [PATCH 1/5] Recherche d'un utilisateur par pseudo --- re2o/script_utils.py | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 re2o/script_utils.py diff --git a/re2o/script_utils.py b/re2o/script_utils.py new file mode 100644 index 00000000..1e86a797 --- /dev/null +++ b/re2o/script_utils.py @@ -0,0 +1,43 @@ +# ⁻*- mode: python; coding: utf-8 -*- +# Re2o est un logiciel d'administration développé initiallement au rezometz. Il +# se veut agnostique au réseau considéré, de manière à être installable en +# quelques clics. +# +# Copyright © 2018 Lev-Arcady Sellem +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os, sys, pwd + +proj_path="/var/www/re2o" +os.environ.setdefault("DJANGO_SETTINGS_MODULE","re2o.settings") +sys.path.append(proj_path) +os.chdir(proj_path) +from django.core.wsgi import get_wsgi_application +application = get_wsgi_application() + + +from django.core.management.base import CommandError +from users.models import User + +def get_user(pseudo): + """Cherche un utilisateur re2o à partir de son pseudo""" + user = User.objects.filter(pseudo=pseudo) + if len(user)==0: + raise CommandError("Utilisateur invalide") + if len(user)>1: + raise CommandError("Plusieurs utilisateurs correspondant à ce pseudo. Ceci NE DEVRAIT PAS arriver") + return user[0] + From d7869d44cdaea3153b74b3996310a190a15e8c94 Mon Sep 17 00:00:00 2001 From: Lev-Arcady Sellem Date: Sun, 25 Mar 2018 19:18:40 +0200 Subject: [PATCH 2/5] =?UTF-8?q?R=C3=A9cup=C3=A9ration=20de=20l'utilisateur?= =?UTF-8?q?=20syst=C3=A8me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- re2o/script_utils.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/re2o/script_utils.py b/re2o/script_utils.py index 1e86a797..4bfbb064 100644 --- a/re2o/script_utils.py +++ b/re2o/script_utils.py @@ -41,3 +41,7 @@ def get_user(pseudo): raise CommandError("Plusieurs utilisateurs correspondant à ce pseudo. Ceci NE DEVRAIT PAS arriver") return user[0] + +def get_system_user(): + """Retourne l'utilisateur système ayant lancé la commande""" + return pwd.getpwuid(int(os.getenv("SUDO_UID") or os.getuid())).pw_name From 64e3a9e7c2ff210301d6e23ab69582cc8554be1d Mon Sep 17 00:00:00 2001 From: Lev-Arcady Sellem Date: Sun, 25 Mar 2018 19:19:50 +0200 Subject: [PATCH 3/5] Remplissage d'un formulaire depuis la ligne de commande MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Attention, ne prend pas encore en charge les cases à cocher/sélectionner, seulement les champs textuels et les champs cachés --- re2o/script_utils.py | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/re2o/script_utils.py b/re2o/script_utils.py index 4bfbb064..e72ea626 100644 --- a/re2o/script_utils.py +++ b/re2o/script_utils.py @@ -32,6 +32,12 @@ application = get_wsgi_application() from django.core.management.base import CommandError from users.models import User +from django.utils.html import strip_tags +from reversion import revisions as reversion +from django.db import transaction +from getpass import getpass + + def get_user(pseudo): """Cherche un utilisateur re2o à partir de son pseudo""" user = User.objects.filter(pseudo=pseudo) @@ -45,3 +51,36 @@ def get_user(pseudo): def get_system_user(): """Retourne l'utilisateur système ayant lancé la commande""" return pwd.getpwuid(int(os.getenv("SUDO_UID") or os.getuid())).pw_name + + +def form_cli(Form,user,action,*args,**kwargs): + """ + Remplit un formulaire à partir de la ligne de commande + Form : le formulaire (sous forme de classe) à remplir + user : l'utilisateur re2o faisant la modification + action : l'action réalisée par le formulaire (pour les logs) + Les arguments suivants sont transmis tels quels au formulaire. + """ + data={} + dumb_form = Form(user=user,*args,**kwargs) + for key in dumb_form.fields: + if not dumb_form.fields[key].widget.input_type=='hidden': + if dumb_form.fields[key].widget.input_type=='password': + data[key]=getpass("%s : " % dumb_form.fields[key].label) + else: + data[key]=input("%s : " % dumb_form.fields[key].label) + + form = Form(data,user=user,*args,**kwargs) + if not form.is_valid(): + sys.stderr.write("Erreurs : \n") + for err in form.errors: + #Oui, oui, on gère du HTML là où d'autres ont eu la lumineuse idée de le mettre + sys.stderr.write("\t%s : %s\n" % (err,strip_tags(form.errors[err]))) + raise CommandError("Formulaire invalide") + + with transaction.atomic(), reversion.create_revision(): + form.save() + reversion.set_user(user) + reversion.set_comment(action) + + sys.stdout.write("%s : effectué. La modification peut prendre quelques minutes pour s'appliquer.\n" % action) From 3c9d4b0e6d6d202cdb16ed8a01900ce0c0a43098 Mon Sep 17 00:00:00 2001 From: Lev-Arcady Sellem Date: Sun, 25 Mar 2018 19:22:02 +0200 Subject: [PATCH 4/5] Changement de mot de passe en ligne de commande --- users/management/commands/chgpass.py | 47 ++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 users/management/commands/chgpass.py diff --git a/users/management/commands/chgpass.py b/users/management/commands/chgpass.py new file mode 100644 index 00000000..c3fabf8a --- /dev/null +++ b/users/management/commands/chgpass.py @@ -0,0 +1,47 @@ +# ⁻*- mode: python; coding: utf-8 -*- +# Re2o est un logiciel d'administration développé initiallement au rezometz. Il +# se veut agnostique au réseau considéré, de manière à être installable en +# quelques clics. +# +# Copyright © 2018 Lev-Arcady Sellem +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os, pwd + +from django.core.management.base import BaseCommand, CommandError +from users.forms import PassForm +from re2o.script_utils import get_user, get_system_user, form_cli + +class Command(BaseCommand): + help = "Changer le mot de passe d'un utilisateur" + + def add_arguments(self, parser): + parser.add_argument('target_username', nargs='?') + + def handle(self, *args, **kwargs): + + current_username = get_system_user() + current_user = get_user(current_username) + target_username = kwargs["target_username"] or current_username + target_user = get_user(target_username) + + ok, msg = target_user.can_change_password(current_user) + if not ok: + raise CommandError(msg) + + self.stdout.write("Changement du mot de passe de %s" % target_user.pseudo) + + form_cli(PassForm,current_user,"Changement du mot de passe",instance=target_user) From da50e66aa534e6bc819d62410ee668673144e9b6 Mon Sep 17 00:00:00 2001 From: Lev-Arcady Sellem Date: Sun, 25 Mar 2018 19:24:48 +0200 Subject: [PATCH 5/5] Factorisation --- users/management/commands/chsh.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/users/management/commands/chsh.py b/users/management/commands/chsh.py index df4d6c0d..6c5b06f7 100644 --- a/users/management/commands/chsh.py +++ b/users/management/commands/chsh.py @@ -26,6 +26,7 @@ from django.db import transaction from reversion import revisions as reversion from users.models import User, ListShell +from re2o.script_utils import get_user, get_system_user class Command(BaseCommand): help = 'Change the default shell of a user' @@ -35,14 +36,7 @@ class Command(BaseCommand): def handle(self, *args, **options): - def get_user(user_pseudo): - """Return the user queried by pseudo, and exit the script if not found.""" - user = User.objects.filter(pseudo=user_pseudo) - if not user: - raise CommandError("Utilisateur invalide") - return user[0] - - current_username = pwd.getpwuid(int(os.getenv("SUDO_UID") or os.getuid())).pw_name + current_username = get_system_user() current_user = get_user(current_username) target_username = options["target_username"] or current_username