Enabled login via libzakauthe.

diff --git a/configure.ac b/configure.ac
index 0198b211a520fff6aaf909ea18e7242172999044..3302de98c0f965405044f3af94faec349b148c51 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,7 @@ PKG_CHECK_MODULES(BCITYFE, [glib-2.0 >= 2.36
                                                        libgdaex >= 0.5.0
                                                        libsolipa >= 0.5.0
                                                        ctpl >= 0.3.0
+                                                       libzakauthe >= 0.5.0
                             libzakutils
                                                        libzakform
                                                        libzakcgi])

diff --git a/data/bcity_fe/ctpl/login_index.ctpl b/data/bcity_fe/ctpl/login_index.ctpl
index e44f297373723ff2f42110fcc14f8e98c0c73f2d..35c9e098602c4a1655b9e878c8e4ff0fd43ac58c 100644 (file)
--- a/data/bcity_fe/ctpl/login_index.ctpl
+++ b/data/bcity_fe/ctpl/login_index.ctpl
@@ -1,8 +1,9 @@
-<form class="form-signin">
+{msg}
+<form class="form-signin" action="/bcity/bcity_fe/login/index" method="post">
          <h2 class="form-signin-heading">B-City</h2>
-         <label for="inputEmail" class="sr-only">Email</label>
-         <input type="email" id="inputEmail" class="form-control" placeholder="Email" required autofocus>
-         <label for="inputPassword" class="sr-only">Password</label>
-         <input type="password" id="inputPassword" class="form-control" placeholder="Password" required>
-         <button class="btn btn-lg btn-primary btn-block" type="submit">Accedi</button>
+         <label for="username" class="sr-only">Email</label>
+         <input type="email" id="username" name="username" class="form-control" placeholder="Email" required autofocus>
+         <label for="password" class="sr-only">Password</label>
+         <input type="password" id="password" name="password" class="form-control" placeholder="Password" required>
+         <button id="submit" name="submit" class="btn btn-lg btn-primary btn-block" type="submit">Accedi</button>
 </form>

diff --git a/src/commons.c b/src/commons.c
index 034033b4dec1a400233309246b584cc015dd8cab..aa952b6e66751281045ce133e834b40cfc685a22 100644 (file)
--- a/src/commons.c
+++ b/src/commons.c
@@ -88,5 +88,5 @@ gchar
 gboolean
 get_is_logged (Commons *commons)
 {
-       return (zak_cgi_session_get_value (commons->zcgi_session, "user_name") != NULL);
+       return (zak_cgi_session_get_value (commons->zcgi_session, "username") != NULL);
 }

diff --git a/src/login.c b/src/login.c
index 3e252111b18d9e3ef2ff9cad1798487fb2386913..da5bd6c1179dd0262b88ad17c3c700ae0898d1c9 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -22,21 +22,99 @@
 
 #include <syslog.h>
 
+#include <libzakauthe.h>
+
 #include "login.h"
 
+static gchar
+*login_post (Commons *commons)
+{
+       GError *error;
+
+       guint i;
+
+       ZakAuthe *authe;
+       gchar **authe_params;
+       gsize n_authe_params;
+       GSList *sl_authe_params;
+
+       gchar *username;
+       gchar *password;
+
+       /* leggo i parametri per l'autenticazione */
+       error = NULL;
+       authe_params = g_key_file_get_keys (commons->config, "ZAKAUTHE", &n_authe_params, &error);
+       if (authe_params == NULL)
+               {
+                       syslog (LOG_MAKEPRI(LOG_SYSLOG, LOG_DEBUG), "Impossibile leggere la configurazione per il sistema di autenticazione.");
+                       return FALSE;
+               }
+
+       sl_authe_params = NULL;
+       for (i = 0; i < n_authe_params; i++)
+               {
+                       error = NULL;
+                       sl_authe_params = g_slist_append (sl_authe_params, g_key_file_get_string (commons->config, "ZAKAUTHE", authe_params[i], &error));
+               }
+
+       g_strfreev (authe_params);
+
+       /* autenticazione */
+       authe = zak_authe_new ();
+       zak_authe_set_config (authe, sl_authe_params);
+
+       username = g_strdup ((gchar *)g_value_get_string ((GValue *)zak_cgi_main_get_stdin_field (commons->zcgi_main, "username")));
+       password = g_strdup ((gchar *)g_value_get_string ((GValue *)zak_cgi_main_get_stdin_field (commons->zcgi_main, "password")));
+
+       if (!zak_authe_authe_nogui (authe, username, password, NULL))
+               {
+                       g_free (username);
+                       username = NULL;
+               }
+       return username;
+}
+
 void
 login_index (GMatchInfo *minfo, gpointer user_data)
 {
        CtplEnviron *env;
 
+       gchar *msg;
+       gchar *username;
        gchar *filename;
        gchar *content;
 
        Commons *commons = (Commons *)user_data;
 
+       if (get_is_logged (commons))
+               {
+                       zak_cgi_main_redirect (commons->zcgi_main, "/bcity/bcity_fe/index/index");
+                       return;
+               }
+
+       env = ctpl_environ_new ();
+       ctpl_environ_push_string (env, "msg", "");
+       if (zak_cgi_main_is_post (commons->zcgi_main))
+               {
+                       username = login_post (commons);
+                       if (username != NULL)
+                               {
+                                       zak_cgi_session_set_value (commons->zcgi_session, "username", username);
+                                       zak_cgi_main_redirect (commons->zcgi_main, "/bcity/bcity_fe/index/index");
+                                       return;
+                               }
+                       else
+                               {
+                                       msg = g_strdup ("<div class=\"alert alert-danger\" role=\"alert\">Utente o password non validi.</div>\n");
+                                       ctpl_environ_push_string (env, "msg", msg);
+                                       g_free (msg);
+                               }
+               }
+
        filename = g_build_filename (commons->ctpldir, "login_index.ctpl", NULL);
-       content = get_ctpl_filled (filename, NULL);
+       content = get_ctpl_filled (filename, env);
        g_free (filename);
+       ctpl_environ_unref (env);
 
        env = ctpl_environ_new ();
        ctpl_environ_push_string (env, "head", "");
@@ -46,6 +124,7 @@ login_index (GMatchInfo *minfo, gpointer user_data)
        g_string_printf (commons->out, "%s",
                                         get_ctpl_filled (filename, env));
        g_free (filename);
+       ctpl_environ_unref (env);
 
        g_free (content);
 }