Merge branch '2.7.0/staging' into dist/eole/2.7.0/staging

Raison : les tâches post en 2.7.0 ne sont pas appelées correctement
si le serveur est client d'un serveur de sauvegarde (bug)
-> Retour à une tâche cron.

Makefile

@@ -4,8 +4,8 @@
 
 SOURCE=eole-mariadb
 VERSION=0.0.1
-EOLE_VERSION=2.7
-EOLE_RELEASE=2.7.1
+EOLE_VERSION=2.6
+EOLE_RELEASE=2.6.2
 PKGAPPS=non
 #FLASK_MODULE=<APPLICATION>
 

README.md

@@ -1,31 +1,5 @@
 # eole-mariadb
 
-Paquet porté pour la 2.7.1. Les tests n'ont été réalisé que sur un Eolebase.
-
-La version utilisé est mariadb 10.3
-
-Ajout de ce paquet sur une 2.7.1 :
-
-## Add the Cadoles repository on all the nodes and the Leader
-
-  GenConfig  [Mode Expert] -> Dépôts Tiers
-
- * Libellé du dépôt : Cadoles dev
- * Déclaration du dépôt : deb [ arch=all ] https://vulcain.cadoles.com 2.7.1-dev main
- * Méthode de récupération de la clé publique du dépôt : URL de la clé
- * URL de la clé : https://vulcain.cadoles.com/cadoles.gpg
-
-## Add the MariaDB repository on all the nodes and the Leader
-
-GenConfig (Mode Expert) -> Dépôt tiers :
- * Libellé du dépôt : MariaDB
- * Déclaration du dépôt :  deb [ arch=amd64 ] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.3/ubuntu bionic main
- * Méthode de récupération de la clé publique du dépôt : serveur de clés
- * URL du serveur de clés : hkp://keyserver.ubuntu.com:80
- * Empreinte de la clé : 0xF1656F24C74CD1D8
-
-#######################################################################
-
 Paquet porté pour la 2.7.0. Les tests n'ont été réalisé que sur un Eolebase.
 
 La version utilisé est mariadb 10.3

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,18 @@
+Source: eole-mariadb
+Section: web
+Priority: optional
+Maintainer: Cadoles <eole@ac-dijon.fr>
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
+Homepage: https://forge.cadoles.com/Cadoles/eole-mariadb
+Vcs-Git: https://forge.cadoles.com/Cadoles/eole-mariadb.git
+Vcs-Browser: https://forge.cadoles.com/Cadoles/eole-mariadb
+
+Package: eole-mariadb
+Architecture: all
+Depends: ${misc:Depends}, mariadb-server, mariadb-backup
+Conflicts: eole-mysql
+Provides: eole-mysql
+Description: Dictionnaires et templates pour la configuration d'un serveur MariaDB, testée uniquement avec eolebase
+ .
+ Pour toute information complémentaire, veuillez vous rendre sur la forge Cadoles.

debian/copyright

@@ -0,0 +1,44 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: {PROJECT}
+Source: {URL}
+
+Files: *
+Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
+License: {UPSTREAM LICENSE}
+
+Files: debian/*
+Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
+License: CeCILL-2
+
+License: {UPSTREAM LICENSE}
+ {TEXT OF THE LICENSE}
+
+License: CeCILL-2
+ This software is governed by the CeCILL-2 license under French law and
+ abiding by the rules of distribution of free software.  You can  use,
+ modify and or redistribute the software under the terms of the CeCILL-2
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info";.
+ .
+ As a counterpart to the access to the source code and  rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty  and the software's author,  the holder of the
+ economic rights,  and the successive licensors  have only  limited
+ liability.
+ .
+ In this respect, the user's attention is drawn to the risks associated
+ with loading,  using,  modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean  that it is complicated to manipulate,  and  that  also
+ therefore means  that it is reserved for developers  and  experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and,  more generally, to use and operate it in the
+ same conditions as regards security.
+ .
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL-2 license and that you accept its terms.
+ .
+ On Eole systems, the complete text of the CeCILL-2 License can be found
+ in '/usr/share/common-licenses/CeCILL-2-en'.

debian/gbp.conf

@@ -0,0 +1,3 @@
+# Set per distribution debian tag
+[DEFAULT]
+debian-tag = debian/eole/%(version)s

debian/rules

@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

dicos/25_bdd_server.xml

@@ -49,13 +49,7 @@
                 <value>Default</value>
             </variable>
             <variable name="accLimitTarget" type="string" description="Restriction d'accès à ces IP/noms d'hôtes (liste séparateur séparateur ',')" />
-            <variable name="create_db" type='oui/non' description="Créer des bases de données">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="MariaDB Databases">
-            <variable name="db_name" type='string' description='Nom de la base de donnée' multi="True"/>
-            <variable name="db_admin_user" type='string' description="Nom de l'utilisateur gestionnaire de la base de données"/>
+
         </family>
 
         <!-- Tunning -->
@@ -141,11 +135,10 @@
         </family>
         <separators>
             <separator name='dbCreateFixAdmin'>Comptes d'administration supplémentaires</separator>
-            <separator name='create_db'>Ajouter des bases de données</separator>
         </separators>
     </variables>
     <constraints>
-        <check name="valid_ipnetmask" target="maskMariaDBLimit" level="warning">
+	<check name="valid_ipnetmask" target="maskMariaDBLimit" level="warning">
             <param type='eole'>ipMariaDBLimit</param>
         </check>	
 
@@ -174,10 +167,6 @@
            <slave>ifMariaDBLimit</slave>
         </group>
 
-        <group master='db_name'>
-            <slave>db_admin_user</slave>
-        </group>
-
         <fill name='calc_multi_condition' target='accLimitTarget'>
             <param>Default</param>
             <param type='eole' name='condition_1'>accLimits</param>
@@ -196,11 +185,6 @@
             <target type='servicelist'>bdd</target>
         </condition>
 
-        <condition name='disabled_if_in' source='create_db'>
-            <param>non</param>
-            <target type='family'>MariaDB Databases</target>
-        </condition>
-
         <condition name='disabled_if_in' source="dbCreateFixAdmin">
             <param>non</param>
             <target type='variable'>accName</target>

scripts/extract_hydra

@@ -0,0 +1,69 @@
+#!/bin/bash
+
+DESC="Extraction des logs de connexion de la base Hydra"
+
+. /usr/share/eole/schedule/config.sh
+
+file_date=$(date '+%Y%m%d' -d@$(($(date +%s) -3600*24))) # Date pour le format des noms de fichier
+today=$(date '+%Y-%m-%d') # Date de fin de requête
+yesterday=$(date '+%Y-%m-%d' -d@$(($(date +%s) -3600*24))) # Date de début de requête
+exit_status=0
+
+echo "Begin date: $(date)"
+
+mysql --defaults-file=/etc/mysql/debian.cnf hydra <<EOF
+select concat ('requested_at: ', requested_at),
+       concat ('request_id: ', request_id),
+       concat ('client_id: ', client_id),
+       concat ('subject: ', subject)
+       into outfile 'access-${file_date}' character set utf8 fields terminated by '|'
+       from hydra_oauth2_access
+       where requested_at >= '${yesterday} 00:00:00' and requested_at < '${today} 00:00:00'
+       order by requested_at ;
+EOF
+(( exit_status = exit_status || $? ))
+
+mysql --defaults-file=/etc/mysql/debian.cnf hydra <<EOF
+select concat ('requested_at: ', requested_at),
+       concat ('challenge: ', challenge),
+       concat ('error: ', error),
+       concat ('session_access_token: ', session_access_token),
+       concat ('session_id_token: ', session_id_token),
+       concat ('handled at: ', handled_at)
+       into outfile 'consent-request-handled-${file_date}' character set utf8 fields terminated by '|'
+       from hydra_oauth2_consent_request_handled
+       where requested_at >= '${yesterday} 00:00:00' and requested_at < '${today} 00:00:00'
+       order by requested_at ;
+EOF
+(( exit_status = exit_status || $? ))
+
+mysql --defaults-file=/etc/mysql/debian.cnf hydra <<EOF
+select concat ('requested_at: ', requested_at),
+       concat ('challenge: ', challenge),
+       concat ('request_url: ', request_url),
+       concat ('client_id: ', client_id),
+       concat ('login_session_id: ', login_session_id)
+       into outfile 'authentication-request-${file_date}' character set utf8 fields terminated by '|'
+       from hydra_oauth2_authentication_request
+       where requested_at >= '${yesterday} 00:00:00' and requested_at < '${today} 00:00:00'
+       order by requested_at ;
+EOF
+(( exit_status = exit_status || $? ))
+
+# Tags must be 32 char long max (otherwise, default fwd template truncates it)
+logger -f /var/lib/mysql/hydra/access-${file_date} -t mariadb_hydra-access-${file_date}
+logger -f /var/lib/mysql/hydra/consent-request-handled-${file_date} -t mariadb_hydra-consreq-h-${file_date}
+logger -f /var/lib/mysql/hydra/authentication-request-${file_date} -t mariadb_hydra-authreq-${file_date}
+
+# Remove log files older than 7 days (already saved on the NAS)
+find /var/lib/mysql/hydra/ -name 'access-*' -type f -mtime +7 -exec rm -vf {} \;
+find /var/lib/mysql/hydra/ -name 'consent-request-handled-*' -type f -mtime +7 -exec rm -vf {} \;
+find /var/lib/mysql/hydra/ -name 'authentication-request-*' -type f -mtime +7 -exec rm -vf {} \;
+
+find /var/log/rsyslog/local/mariadb_hydra/ -name 'access-*' -type f -mtime +7 -exec rm -vf {} \;
+find /var/log/rsyslog/local/mariadb_hydra/ -name 'consreq-h-*' -type f -mtime +7 -exec rm -vf {} \;
+find /var/log/rsyslog/local/mariadb_hydra/ -name 'authreq-*' -type f -mtime +7 -exec rm -vf {} \;
+
+echo "End date: $(date)"
+
+exit $exit_status

scripts/get_hydra_table_sizes

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+(
+mysql --defaults-file=/etc/mysql/debian.cnf hydra <<EOF
+SELECT
+  TABLE_NAME AS \`Table\`,
+  ROUND((DATA_LENGTH + INDEX_LENGTH) / 1024 / 1024) AS \`Size\`
+FROM
+  information_schema.TABLES
+WHERE
+  TABLE_SCHEMA = "hydra"
+ORDER BY
+  (DATA_LENGTH + INDEX_LENGTH)
+DESC;
+EOF
+) | while read table size; do
+  if [ "${table}" != Table ]; then
+    real_size=$(ls -lh /var/lib/mysql/hydra/${table}.ibd | cut -d' ' -f 5)
+  else
+    real_size="Taille réelle"
+  fi
+  echo -e ${table}\\t${size}M\\t${real_size}
+done
+
+echo $a

scripts/optimize_hydra

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# Optimize sur les tables d'Hydra
+
+echo "Begin date: $(date)"
+
+part=$1
+
+if [ -z "$part" ]; then
+    echo 'Bad empty part. Please give a number between 1 and 7'
+    exit 1
+fi
+
+case $part in
+    1)
+	tables='hydra_oauth2_access'
+	;;
+    2)
+	tables='hydra_oauth2_oidc'
+	;;
+    3)
+	tables='hydra_oauth2_code'
+	;;
+    4)
+	tables='hydra_oauth2_authentication_request'
+	;;
+    5)
+	tables='hydra_oauth2_consent_request'
+	;;
+    6)
+	tables='hydra_oauth2_logout_request, hydra_oauth2_consent_request_handled'
+	;;
+    7)
+	tables='hydra_oauth2_authentication_session, hydra_oauth2_authentication_request_handled, hydra_oauth2_pkce'
+	;;
+    *)
+	echo "Unexpected error. Part: $part"
+	exit 1
+esac
+
+mysql --defaults-file=/etc/mysql/debian.cnf hydra <<EOF
+OPTIMIZE TABLE $tables;
+EOF
+
+exit_val=$?
+
+echo "End date:   $(date)"
+
+exit $exit_val