From 684aa284b8ba55e01d7665d9f255c2396a8c788a Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Tue, 15 Oct 2013 16:05:31 +0200 Subject: [PATCH] Added function autentica_get_password. Added tests. --- Makefile.am | 2 +- configure.ac | 5 ++-- src/aute_smbldap.c | 23 +++++++++++++++-- tests/Makefile.am | 12 +++++++++ tests/run_test | 1 + tests/run_test_get_password | 1 + tests/test.c | 45 +++++++++++++++++++++++++++++++++ tests/test_get_password.c | 50 +++++++++++++++++++++++++++++++++++++ 8 files changed, 134 insertions(+), 5 deletions(-) create mode 100644 tests/Makefile.am create mode 100644 tests/run_test create mode 100644 tests/run_test_get_password create mode 100644 tests/test.c create mode 100644 tests/test_get_password.c diff --git a/Makefile.am b/Makefile.am index d79362d..9e6e205 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS = src data doc +SUBDIRS = src tests data doc diff --git a/configure.ac b/configure.ac index e4113cf..ed5b8d2 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([libaute-smbldap], [0.1.0], [azagli@libero.it]) +AC_INIT([libaute-smbldap], [0.1.1], [azagli@libero.it]) AC_CONFIG_SRCDIR([src/aute_smbldap.c]) AC_CONFIG_HEADER([config.h]) @@ -22,7 +22,7 @@ AC_PROG_LIBTOOL # Checks for libraries. PKG_CHECK_MODULES(LIBAUTESMBLDAP, [gtk+-2.0 >= 2.16.0 - libaute >= 0.1.0]) + libaute >= 0.1.1]) AC_SUBST(LIBAUTESMBLDAP_CFLAGS) AC_SUBST(LIBAUTESMBLDAP_LIBS) @@ -65,6 +65,7 @@ AC_C_CONST AC_CONFIG_FILES([ Makefile src/Makefile + tests/Makefile data/Makefile data/libaute-smbldap/Makefile data/libaute-smbldap/gui/Makefile diff --git a/src/aute_smbldap.c b/src/aute_smbldap.c index bfcfb69..93210d5 100644 --- a/src/aute_smbldap.c +++ b/src/aute_smbldap.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 Andrea Zagli + * Copyright (C) 2010-2013 Andrea Zagli * * 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 @@ -380,6 +380,7 @@ static gchar || groups_ou == NULL || user_field == NULL) { + g_warning ("Missing some parameters."); return NULL; } @@ -870,7 +871,7 @@ autesmbldap_on_btn_find_clicked (GtkButton *button, /* PUBLIC */ gchar -*autentica (GSList *parameters) +*autentica_get_password (GSList *parameters, gchar **password) { GError *error; gchar *ret = NULL; @@ -950,12 +951,30 @@ gchar break; } + if (ret != NULL && g_strcmp0 (ret, "") != 0 && password != NULL && *password == NULL) + { + if (g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (txt_password_conferma)), "") != 0) + { + *password = g_strdup (gtk_entry_get_text (GTK_ENTRY (txt_password_conferma))); + } + else + { + *password = g_strdup (gtk_entry_get_text (GTK_ENTRY (txt_password))); + } + } + gtk_widget_destroy (diag); g_object_unref (gtkbuilder); return ret; } +gchar +*autentica (GSList *parameters) +{ + return autentica_get_password (parameters, NULL); +} + static void autesmbldap_on_vbx_users_list_destroy (GtkObject *object, gpointer user_data) diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..b77fae1 --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,12 @@ +AM_CPPFLAGS = $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(LIBAUTESMBLDAP_CFLAGS) \ + -I../src + +LIBS = $(GTK_LIBS) \ + $(LIBAUTESMBLDAP_LIBS) + +LDADD = ../src/libaute-smbldap.la + +noinst_PROGRAMS = test \ + test_get_password diff --git a/tests/run_test b/tests/run_test new file mode 100644 index 0000000..590fb40 --- /dev/null +++ b/tests/run_test @@ -0,0 +1 @@ +./test libaute-smbldap-0 "ldap://ldap.comune.scandicci.fi.it/" "dc=comune,dc=scandicci,dc=fi,dc=it" "ou=Users" "ou=Groups" "uid" diff --git a/tests/run_test_get_password b/tests/run_test_get_password new file mode 100644 index 0000000..aa54e28 --- /dev/null +++ b/tests/run_test_get_password @@ -0,0 +1 @@ +./test_get_password libaute-smbldap-0 "ldap://ldap.comune.scandicci.fi.it/" "dc=comune,dc=scandicci,dc=fi,dc=it" "ou=Users" "ou=Groups" "uid" diff --git a/tests/test.c b/tests/test.c new file mode 100644 index 0000000..5304075 --- /dev/null +++ b/tests/test.c @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2013 Andrea Zagli + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include + +#include + +int +main (int argc, char **argv) +{ + Aute *aute; + GSList *params; + + gtk_init (&argc, &argv); + + aute = aute_new (); + + params = g_slist_append (params, argv[1]); + params = g_slist_append (params, argv[2]); + params = g_slist_append (params, argv[3]); + params = g_slist_append (params, argv[4]); + params = g_slist_append (params, argv[5]); + params = g_slist_append (params, argv[6]); + + aute_set_config (aute, params); + + g_message ("User: %s\n", aute_autentica (aute)); + + return 0; +} diff --git a/tests/test_get_password.c b/tests/test_get_password.c new file mode 100644 index 0000000..7d90dfa --- /dev/null +++ b/tests/test_get_password.c @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2013 Andrea Zagli + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include + +#include + +int +main (int argc, char **argv) +{ + Aute *aute; + GSList *params; + + gchar *user; + gchar *password; + + gtk_init (&argc, &argv); + + aute = aute_new (); + + params = g_slist_append (params, argv[1]); + params = g_slist_append (params, argv[2]); + params = g_slist_append (params, argv[3]); + params = g_slist_append (params, argv[4]); + params = g_slist_append (params, argv[5]); + params = g_slist_append (params, argv[6]); + + aute_set_config (aute, params); + + password = NULL; + user = aute_autentica_get_password (aute, &password); + g_message ("User: %s - Password: %s\n", user, password); + + return 0; +} -- 2.49.0