From e76cecfbe843cae691504577f5c483f3e8efd686 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sun, 14 Feb 2016 12:13:57 +0100 Subject: [PATCH] Sending confirmation email to new user. --- .gitignore | 3 +- configure.ac | 5 + doc/bcity_fe/db/Makefile.am | 3 +- doc/bcity_fe/db/bcity_fe.sql | 25 ++++- doc/bcity_fe/db/zakauthedb.sql | 2 + doc/bcity_fe/examples/bcity_fe.conf | 6 ++ src/Makefile.am | 2 + src/commons.h | 8 ++ src/main.c | 49 ++++++++- src/user.c | 159 ++++++++++++++++++++++++++-- 10 files changed, 250 insertions(+), 12 deletions(-) create mode 100644 doc/bcity_fe/db/zakauthedb.sql diff --git a/.gitignore b/.gitignore index 9e267da..74ecfbb 100644 --- a/.gitignore +++ b/.gitignore @@ -51,4 +51,5 @@ Rules-quot *.exe *.csv src/bcity_fe -data/bcity_fe/conf \ No newline at end of file +data/bcity_fe/conf +doc/bcity_fe/db/bcity_fe.backup \ No newline at end of file diff --git a/configure.ac b/configure.ac index 8c66f32..ab52f5f 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,11 @@ PKG_CHECK_MODULES(BCITYFE, [glib-2.0 >= 2.36 AC_SUBST(BCITYFE_CFLAGS) AC_SUBST(BCITYFE_LIBS) +AM_PATH_LIBGCRYPT(1.2.1, :, [AC_MSG_ERROR([libgcrypt >= 1.2.1 not found.])]) + +AC_SUBST(LIBGCRYPT_CFLAGS) +AC_SUBST(LIBGCRYPT_LIBS) + # Checks for header files. AC_HEADER_STDC diff --git a/doc/bcity_fe/db/Makefile.am b/doc/bcity_fe/db/Makefile.am index 2baf5e0..97a9f84 100644 --- a/doc/bcity_fe/db/Makefile.am +++ b/doc/bcity_fe/db/Makefile.am @@ -1,6 +1,7 @@ bcity_fe_dbdir = $(docdir)/db bcity_fe_db_DATA = \ - bcity_fe.sql + bcity_fe.sql \ + zakauthedb.sql EXTRA_DIST = $(bcity_fe_db_DATA) diff --git a/doc/bcity_fe/db/bcity_fe.sql b/doc/bcity_fe/db/bcity_fe.sql index 9c5737d..d5d08a2 100644 --- a/doc/bcity_fe/db/bcity_fe.sql +++ b/doc/bcity_fe/db/bcity_fe.sql @@ -2,8 +2,8 @@ -- PostgreSQL database dump -- --- Dumped from database version 9.5.0 --- Dumped by pg_dump version 9.5.0 +-- Dumped from database version 9.5.1 +-- Dumped by pg_dump version 9.5.1 SET statement_timeout = 0; SET lock_timeout = 0; @@ -43,6 +43,18 @@ CREATE TABLE segnalazioni ( ); +-- +-- Name: users_to_register; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE users_to_register ( + link character varying(255) NOT NULL, + code character varying(255), + expire date, + password character varying(8) +); + + -- -- Name: categorie_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -60,6 +72,13 @@ ALTER TABLE ONLY segnalazioni -- --- PostgreSQL database dump complete +-- Name: users_to_register_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- +ALTER TABLE ONLY users_to_register + ADD CONSTRAINT users_to_register_pkey PRIMARY KEY (link); + + +-- +-- PostgreSQL database dump complete +-- diff --git a/doc/bcity_fe/db/zakauthedb.sql b/doc/bcity_fe/db/zakauthedb.sql new file mode 100644 index 0000000..f6f28ac --- /dev/null +++ b/doc/bcity_fe/db/zakauthedb.sql @@ -0,0 +1,2 @@ +ALTER TABLE zakauthedb.users + ALTER COLUMN code TYPE character varying(255); diff --git a/doc/bcity_fe/examples/bcity_fe.conf b/doc/bcity_fe/examples/bcity_fe.conf index 2c36d51..83c019a 100644 --- a/doc/bcity_fe/examples/bcity_fe.conf +++ b/doc/bcity_fe/examples/bcity_fe.conf @@ -7,3 +7,9 @@ cnc_string=PostgreSQL://postgres:postgres@HOST=localhost;DB_NAME=autoz;SEARCHPAT [DB] cnc_string=PostgreSQL://postgres:postgres@HOST=localhost;DB_NAME=bcity + +[MAIL] +smtp=smtp://smtp.localhost/ +security_method=0 +use_auth=0 +user_registration_from=me@myhome.com diff --git a/src/Makefile.am b/src/Makefile.am index b71a430..5428e07 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,12 +4,14 @@ formdir = $(datadir)/$(PACKAGE)/form imagesdir = $(datadir)/$(PACKAGE)/images AM_CPPFLAGS = $(BCITYFE_CFLAGS) \ + $(LIBGCRYPT_CFLAGS) \ -DCONFIGDIR=\""$(configdir)"\" \ -DCTPLDIR=\""$(ctpldir)"\" \ -DFORMDIR=\""$(formdir)"\" \ -DIMAGESDIR=\""$(imagesdir)"\" LIBS = $(BCITYFE_LIBS) \ + $(LIBGCRYPT_LIBS) \ -export-dynamic bin_PROGRAMS = bcity_fe diff --git a/src/commons.h b/src/commons.h index 4ead6fa..86df526 100644 --- a/src/commons.h +++ b/src/commons.h @@ -29,6 +29,7 @@ #include #include #include +#include typedef struct { @@ -50,6 +51,13 @@ typedef struct ZakAutho *autho; ZakAuthoIRole *role_utente; + + Solipa *solipa; + + gchar *smtp_uri; + CamelNetworkSecurityMethod smtp_security_method; + gboolean smtp_use_auth; + gchar *user_registration_from; } Commons; diff --git a/src/main.c b/src/main.c index 65e196f..de6d6ad 100644 --- a/src/main.c +++ b/src/main.c @@ -24,6 +24,7 @@ #include #include +#include #include "commons.h" #include "index.h" @@ -47,6 +48,8 @@ main (int argc, char *argv[]) GdaConnection *gdacon; + gchar *str; + gda_init (); /* inizializzazione commons */ @@ -57,6 +60,9 @@ main (int argc, char *argv[]) commons->formdir = g_strdup (FORMDIR); commons->imagesdir = g_strdup (IMAGESDIR); + /* inizializzo solipa */ + commons->solipa = solipa_new (); + /* leggo la configurazione dal file */ error = NULL; commons->config = g_key_file_new (); @@ -120,6 +126,46 @@ main (int argc, char *argv[]) zak_autho_set_role_name_prefix (commons->autho, g_key_file_get_value (commons->config, "ZAKAUTHO", "role_name_prefix", NULL)); zak_autho_set_resource_name_prefix (commons->autho, g_key_file_get_value (commons->config, "ZAKAUTHO", "resource_name_prefix", NULL)); + /* leggo i parametri per l'invio delle mail */ + error = NULL; + commons->smtp_uri = g_key_file_get_value (commons->config, "MAIL", "smtp", &error); + if (commons->smtp_uri == NULL) + { + g_warning ("Impossibile leggere l'indirizzo del server smtp: %s.\n", + error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); + } + + error = NULL; + str = g_key_file_get_value (commons->config, "MAIL", "security_method", &error); + if (str == NULL) + { + commons->smtp_security_method = CAMEL_NETWORK_SECURITY_METHOD_NONE; + } + else + { + commons->smtp_security_method = strtol (str, NULL, 10); + } + + error = NULL; + str = g_key_file_get_value (commons->config, "MAIL", "use_auth", &error); + if (str == NULL) + { + commons->smtp_use_auth = FALSE; + } + else + { + commons->smtp_use_auth = zak_utils_string_to_boolean (str); + } + + error = NULL; + commons->user_registration_from = g_key_file_get_value (commons->config, "MAIL", "user_registration_from", &error); + if (commons->user_registration_from == NULL + || g_strcmp0 (g_strstrip (commons->user_registration_from), "") == 0) + { + g_warning ("Impossibile leggere l'indirizzo del mittente per le mail di conferma registrazione utenti: %s.\n", + error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); + } + commons->zcgi_main = zak_cgi_main_new (); commons->out = g_string_new (""); @@ -142,7 +188,6 @@ main (int argc, char *argv[]) zak_cgi_url_connect (zcgi_url, "/login/index", (ZakCgiUrlConnectedFunction)login_index, commons); zak_cgi_url_connect (zcgi_url, "/login/logout", (ZakCgiUrlConnectedFunction)login_logout, commons); - zak_cgi_url_connect (zcgi_url, "/user[/]?", (ZakCgiUrlConnectedFunction)user_register, commons); zak_cgi_url_connect (zcgi_url, "/user/register", (ZakCgiUrlConnectedFunction)user_register, commons); @@ -156,5 +201,7 @@ main (int argc, char *argv[]) g_string_free (header, TRUE); g_string_free (commons->out, TRUE); + g_object_unref (commons->solipa); + return 0; } diff --git a/src/user.c b/src/user.c index 0f5c6c6..b60005b 100644 --- a/src/user.c +++ b/src/user.c @@ -20,8 +20,13 @@ #include #endif +#include + +#include +#include #include #include +#include #include "user.h" @@ -44,6 +49,17 @@ user_register (GMatchInfo *minfo, gpointer user_data) gchar *cnc_string; GdaEx *gdaex_authedb; + SolipaMail *smail; + CamelInternetAddress *addr; + GSList *addrs; + + gchar *password; + gchar *link_conferma; + gchar *body; + gchar *body_html; + + ZakFormElement *form_element; + Commons *commons = (Commons *)user_data; if (get_is_logged (commons)) @@ -76,7 +92,7 @@ user_register (GMatchInfo *minfo, gpointer user_data) { g_warning ("Impossibile leggere la stringa di connessione per libzakauthe dal file di configurazione: %s.", error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); - ctpl_environ_push_string (env, "form", "Form is valid!!! NOT SAVED!!!"); + ctpl_environ_push_string (env, "form", "Errore durante il salvataggio."); } else { @@ -84,25 +100,156 @@ user_register (GMatchInfo *minfo, gpointer user_data) if (gdaex_authedb == NULL) { g_warning ("Errore nella connessione al database libzakauthe: %s", cnc_string); - ctpl_environ_push_string (env, "form", "Form is valid!!! NOT SAVED!!!"); + ctpl_environ_push_string (env, "form", "Errore durante il salvataggio."); } else { form_provider = zak_form_gdaex_provider_new (gdaex_authedb, "users"); if (form_provider == NULL) { - g_warning ("Errore nella creazione dewl form_provider."); - ctpl_environ_push_string (env, "form", "Form is valid!!! NOT SAVED!!!"); + g_warning ("Errore nella creazione del form_provider."); + ctpl_environ_push_string (env, "form", "Errore durante il salvataggio."); } else { if (zak_form_form_insert (ZAK_FORM_FORM (form), ZAK_FORM_IPROVIDER (form_provider))) { - ctpl_environ_push_string (env, "form", "Form is valid!!! SAVED WITH SUCCESS!!!"); + form_element = zak_form_form_get_element_by_id (ZAK_FORM_FORM (form), "code"); + + /* genero la password */ + gchar *str; + gchar digest[17] = ""; + gchar pwd_gcrypt[33] = ""; + + str = g_strdup_printf ("%f", g_random_double ()); + + gcry_md_hash_buffer (GCRY_MD_MD5, &digest, str, strlen (str)); + for (i = 0; i < 16; i++) + { + g_sprintf (pwd_gcrypt + (i * 2), "%02x", digest[i] & 0xFF); + } + pwd_gcrypt[32] = '\0'; + + password = g_strndup (&pwd_gcrypt[0], 8); + + g_free (str); + + /* genero il link conferma */ + str = g_strdup_printf ("%f", g_random_double ()); + + gcry_md_hash_buffer (GCRY_MD_MD5, &digest, str, strlen (str)); + for (i = 0; i < 16; i++) + { + g_sprintf (pwd_gcrypt + (i * 2), "%02x", digest[i] & 0xFF); + } + pwd_gcrypt[32] = '\0'; + + link_conferma = g_strdup_printf ("http://localhost/bcity/bcity_fe/user/confirm/%s", + &pwd_gcrypt[0]); + + g_free (str); + + /* salvo l'attesa di registrazione nel db */ + GValue *gval; + GdaExSqlBuilder *sqlb; + GDateTime *gdt_now; + GDateTime *gdt; + + sqlb = gdaex_sql_builder_new (GDA_SQL_STATEMENT_INSERT); + + gdaex_sql_builder_from (sqlb, "users_to_register", ""); + + gval = zak_utils_gvalue_new_string (&pwd_gcrypt[0]); + gdaex_sql_builder_fields (sqlb, + "users_to_register", "link", "", gval, + NULL); + g_value_unset (gval); + + gval = zak_utils_gvalue_new_string (zak_form_element_get_value (form_element)); + gdaex_sql_builder_fields (sqlb, + "users_to_register", "code", "", gval, + NULL); + g_value_unset (gval); + + gdt_now = g_date_time_new_now_local (); + gdt = g_date_time_add_days (gdt_now, 15); + gval = zak_utils_gvalue_new_string (zak_utils_gdatetime_to_sql (gdt, NULL)); + gdaex_sql_builder_fields (sqlb, + "users_to_register", "expire", "", gval, + NULL); + g_value_unset (gval); + g_date_time_unref (gdt_now); + g_date_time_unref (gdt); + + gval = zak_utils_gvalue_new_string (password); + gdaex_sql_builder_fields (sqlb, + "users_to_register", "password", "", gval, + NULL); + g_value_unset (gval); + + if (gdaex_sql_builder_execute (sqlb, commons->gdaex, NULL) < 0) + { + g_warning ("Errore durante il salvataggio dell'attesa registrazione."); + } + + /* invio la mail */ + smail = solipa_mail_new (commons->solipa); + solipa_mail_set_security_method (smail, commons->smtp_security_method); + + solipa_mail_set_subject (smail, "Conferma iscrizione a B-City"); + + addr = camel_internet_address_new (); + + addrs = solipa_mail_get_addresses_from_string (commons->user_registration_from); + camel_internet_address_add (addr, + g_hash_table_lookup ((GHashTable *)addrs->data, "name"), + g_hash_table_lookup ((GHashTable *)addrs->data, "address")); + solipa_mail_set_from (smail, addr); + + camel_address_remove (CAMEL_ADDRESS (addr), -1); + + addrs = solipa_mail_get_addresses_from_string (zak_form_element_get_value (form_element)); + camel_internet_address_add (addr, + g_hash_table_lookup ((GHashTable *)addrs->data, "name"), + g_hash_table_lookup ((GHashTable *)addrs->data, "address")); + solipa_mail_add_recipient (smail, addr, SOLIPA_MAIL_RECIPIENT_TYPE_TO); + g_object_unref (addr); + + body = g_strdup_printf ("Conferma la registrazione facendo clic sul seguente collegamento (valido per 15 giorni).\n\n" + "%s\n\n" + "La password a te assegnata è: %s", + link_conferma, + password); + body_html = g_strdup_printf ("\n" + "\n" + "B-City: conferma registrazione</title\n" + "</head>\n" + "<body>\n" + "<div>Conferma la registrazione facendo clic sul seguente collegamento (valido per 15 giorni).</div>\n" + "<div>\n" + "<a href=\"%s\">%s</a>" + "</div>\n" + "<div>La password a te assegnata è: %s</div>\n" + "</body>\n" + "</html>", + link_conferma, + link_conferma, + password); + + solipa_mail_set_body (smail, + body, + body_html); + + solipa_mail_send (smail, commons->smtp_uri); + + g_free (body); + g_free (body_html); + + ctpl_environ_push_string (env, "form", "Utente registrato con successo. È stata inviata una mail per la procedura di conferma con la password assegnata."); } else { - ctpl_environ_push_string (env, "form", "Form is valid!!! NOT SAVED!!!"); + ctpl_environ_push_string (env, "form", "Errore durante il salvataggio."); } } } -- 2.49.0