Changeset a6005da

Timestamp:

2016-03-25T18:07:53Z (9 years ago)

Author:

Dennis Kaarsemaker <dennis@…>

Branches:

master

Children:

50bb490

Parents:

8e6ecfe

git-author:

Dennis Kaarsemaker <dennis@…> (23-02-16 18:52:32)

git-committer:

Dennis Kaarsemaker <dennis@…> (25-03-16 18:07:53)

Message:

Linux pam authentication backend

This backend authenticates users against pam.

Files:

• .travis.yml (modified) (3 diffs)
• auth.c (modified) (2 diffs)
• auth_pam.c (added)
• bitlbee.conf (modified) (1 diff)
• conf.c (modified) (1 diff)
• configure (modified) (3 diffs)
• tests/Makefile (modified) (1 diff)

.travis.yml

@@ -3 +3 @@
 
 script:
- - ./configure
+ - ./configure --pam=1
  - make check
  - BITLBEE_SKYPE=plugin dpkg-buildpackage -uc -us -d
@@ -29 +29 @@
     - libpurple-dev
     - check
+    - libpam0g-dev
   coverity_scan:
     project:
@@ -34 +35 @@
       description: "An IRC to other chat networks gateway"
     notification_email: dx@dxzone.com.ar
-    build_command_prepend: ./configure --otr=1 --debug=1
+    build_command_prepend: ./configure --otr=1 --debug=1 --pam=1
     build_command: make
     branch_pattern: coverity_scan

auth.c

@@ -1 +1 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
+
+#ifdef WITH_PAM
+extern auth_backend_t auth_pam;
+#endif
 
 GList *auth_init(const char *backend)
@@ -6 +10 @@
         GList *gl = NULL;
         int ok = backend ? 0 : 1;
+#ifdef WITH_PAM
+        gl = g_list_append(gl, &auth_pam);
+        if (backend && !strcmp(backend, "pam")) {
+                ok = 1;
+        }
+#endif
 
         return ok ? gl : NULL;

bitlbee.conf

@@ -61 +61 @@
 ## accounts people create to be stored in plain text instead of encrypted with
 ## their bitlbee password.
+##
+## Currently available backends:
+##
+## - storage (internal storage)
+## - pam (Linux PAM authentication)
 #
 # AuthBackend = storage

conf.c

@@ -245 +245 @@
                                 if (g_strcasecmp(ini->value, "storage") == 0) {
                                         conf->auth_backend = NULL;
+                                } else if (g_strcasecmp(ini->value, "pam") == 0) {
+                                        g_free(conf->auth_backend);
+                                        conf->auth_backend = g_strdup(ini->value);
                                 } else {
                                         fprintf(stderr, "Invalid %s value: %s\n", ini->key, ini->value);

configure

@@ -52 +52 @@
 ssl=auto
 
+pam=0
+
 pie=1
 
@@ -133 +135 @@
 --purple=0/1    Disable/enable libpurple support        $purple
                 (automatically disables other protocol modules)
+
+--pam=0/1       Disable/enable PAM authentication       $pam
 
 --doc=0/1       Disable/enable help.txt generation      $doc
@@ -631 +635 @@
 authobjs=
 authlibs=
+if [ "$pam" = 0 ]; then
+        echo '#undef WITH_PAM' >> config.h
+else
+        if ! echo '#include <security/pam_appl.h>' | $CC -E - >/dev/null 2>/dev/null; then
+                echo 'Cannot find libpam development libraries, aborting. (Install libpam0g-dev?)'
+                exit 1
+        fi
+        echo '#define WITH_PAM' >> config.h
+        authobjs=$authobjs'auth_pam.o '
+        authlibs=$authlibs'-lpam '
+fi
 echo AUTH_OBJS=$authobjs >> Makefile.settings
 echo EFLAGS+=$authlibs >> Makefile.settings

tests/Makefile

@@ -15 +15 @@
 distclean: clean
 
-main_objs = bitlbee.o conf.o dcc.o help.o ipc.o irc.o irc_cap.o irc_channel.o irc_commands.o irc_im.o irc_send.o irc_user.o irc_util.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_xml.o auth.o
+main_objs = bitlbee.o conf.o dcc.o help.o ipc.o irc.o irc_cap.o irc_channel.o irc_commands.o irc_im.o irc_send.o irc_user.o irc_util.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_xml.o auth.o auth_pam.o
 
 test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc.o check_help.o check_user.o check_set.o check_jabber_sasl.o check_jabber_util.o