Changeset c7304b2

Timestamp:

2008-01-12T20:07:10Z (17 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

55664fc

Parents:

e65ceaa

Message:

auth via ssl

• move the config file to sysconfdir/skyped/skyped.conf as there will other config files there, too
• autogenerate the ssl paths in skyped.conf.dist
• skype plugin: connect via ssl
• skyped: listen via ssl

Location:

skype

Files:

• Makefile (modified) (1 diff)
• config.mak.in (modified) (1 diff)
• configure.ac (modified) (1 diff)
• skype.c (modified) (7 diffs)
• skyped.conf.dist.in (moved) (moved from skype/skyped.conf.dist) (1 diff)
• skyped.py (modified) (5 diffs)

skype/Makefile

@@ -12 +12 @@
         $(INSTALL) skype.so $(DESTDIR)$(plugindir)
         $(INSTALL) skyped.py $(DESTDIR)$(bindir)/skyped
-        sed -i 's|/etc|$(sysconfdir)|' $(DESTDIR)$(bindir)/skyped
+        sed -i 's|/usr/local/etc/skyped|$(sysconfdir)|' $(DESTDIR)$(bindir)/skyped
         $(INSTALL) -m644 skyped.conf.dist $(DESTDIR)$(sysconfdir)/skyped.conf
 

skype/config.mak.in

@@ -3 +3 @@
 INSTALL = @INSTALL@
 prefix = @prefix@
-sysconfdir = @sysconfdir@
+sysconfdir = @sysconfdir@/skyped
 exec_prefix = @exec_prefix@
 bindir = @bindir@

skype/configure.ac

@@ -17 +17 @@
 LDFLAGS="$LDFLAGS $BITLBEE_LIBS"
 AC_OUTPUT(config.mak)
+AC_OUTPUT(skyped.conf.dist)

skype/skype.c

@@ -28 +28 @@
 #include <poll.h>
 #include <bitlbee.h>
+#include <bitlbee/ssl_client.h>
 #include <glib.h>
 
@@ -63 +64 @@
          * we're connected and when we aren't. */
         int bfd;
+        /* ssl_getfd() uses this to get the file desciptor. */
+        void *ssl;
         /* When we receive a new message id, we query the properties, finally
          * the chatname. Store the properties here so that we can use
@@ -146 +149 @@
         if(pfd[0].revents & POLLHUP)
         {
-                imcb_error( ic, "Could not connect to server" );
                 imc_logout( ic, TRUE );
                 return FALSE;
         }
-        write( sd->fd, buf, len );
+        ssl_write( sd->ssl, buf, len );
 
         return TRUE;
@@ -210 +212 @@
                 return FALSE;
         /* Read the whole data. */
-        st = read( sd->fd, buf, sizeof( buf ) );
+        st = ssl_read( sd->ssl, buf, sizeof( buf ) );
         if( st > 0 )
         {
@@ -720 +722 @@
                                 }
                         }
+                        else if(!strncmp(line, "PASSWORD ", 9))
+                        {
+                                if(!strncmp(line+9, "OK", 2))
+                                        imcb_connected(ic);
+                                else
+                                {
+                                        imcb_error(ic, "Authentication Failed");
+                                        imc_logout( ic, TRUE );
+                                }
+                        }
                         lineptr++;
                 }
@@ -766 +778 @@
 }
 
-gboolean skype_connected( gpointer data, gint source, b_input_condition cond )
+gboolean skype_connected( gpointer data, void *source, b_input_condition cond )
 {
         struct im_connection *ic = data;
-        imcb_connected(ic);
+        struct skype_data *sd = ic->proto_data;
+        if(!source)
+        {
+                sd->ssl = NULL;
+                imcb_error( ic, "Could not connect to server" );
+                imc_logout( ic, TRUE );
+                return FALSE;
+        }
+        imcb_log( ic, "Connected to server, logging in" );
         return skype_start_stream(ic);
 }
@@ -781 +801 @@
 
         imcb_log( ic, "Connecting" );
-        sd->fd = proxy_connect(set_getstr( &acc->set, "server" ), set_getint( &acc->set, "port" ), skype_connected, ic );
+        sd->ssl = ssl_connect(set_getstr( &acc->set, "server" ), set_getint( &acc->set, "port" ), skype_connected, ic );
+        sd->fd = sd->ssl ? ssl_getfd( sd->ssl ) : -1;
         sd->username = g_strdup( acc->user );
 

skype/skyped.conf.dist.in

@@ -3 +3 @@
 # use `echo -n foo|sha1sum` to generate this hash for your password
 password = 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33
+cert = @sysconfdir@/skyped/skyped.cert.pem
+key  = @sysconfdir@/skyped/skyped.key.pem

skype/skyped.py

@@ -37 +37 @@
 import sha
 from ConfigParser import ConfigParser
+from OpenSSL import SSL
 
 __version__ = "0.1.1"
@@ -67 +68 @@
 
 def server(host, port):
-        sock = socket.socket()
+        global options
+
+        ctx = SSL.Context(SSL.TLSv1_METHOD)
+        ctx.use_privatekey_file(options.config.sslkey)
+        ctx.use_certificate_file(options.config.sslcert)
+        sock = SSL.Connection(ctx, socket.socket())
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.bind((host, port))
@@ -76 +82 @@
         global options
         options.conn, addr = sock.accept()
-        lines = options.conn.recv(512).split('\n')
         ret = 0
-        nlines = []
-        for i in lines:
-                if i.startswith("USERNAME") and i.split(' ')[1].strip() == options.config.username:
-                        ret += 1
-                elif i.startswith("PASSWORD") and sha.sha(i.split(' ')[1].strip()).hexdigest() == options.config.password:
-                        ret += 1
-                else:
-                        nlines.append(i)
-        del lines
+        line = options.conn.recv(1024)
+        if line.startswith("USERNAME") and line.split(' ')[1].strip() == options.config.username:
+                ret += 1
+        line = options.conn.recv(1024)
+        if line.startswith("PASSWORD") and sha.sha(line.split(' ')[1].strip()).hexdigest() == options.config.password:
+                ret += 1
         if ret == 2:
                 dprint("Username and password OK.")
-                options.buf = nlines
-                input_handler(None, None)
+                options.conn.send("PASSWORD OK\n")
                 gobject.io_add_watch(options.conn, gobject.IO_IN, input_handler)
                 return True
         else:
                 dprint("Username and/or password WRONG.")
+                options.conn.send("PASSWORD KO\n")
                 return False
 
@@ -153 +155 @@
 class Options:
         def __init__(self):
-                self.cfgpath = "/etc/skyped.conf"
+                self.cfgpath = "/usr/local/etc/skyped/skyped.conf"
                 self.daemon = True
                 self.debug = False
@@ -217 +219 @@
         options.config.username = options.config.get('skyped', 'username').split('#')[0]
         options.config.password = options.config.get('skyped', 'password').split('#')[0]
+        options.config.sslkey = options.config.get('skyped', 'key').split('#')[0]
+        options.config.sslcert = options.config.get('skyped', 'cert').split('#')[0]
         dprint("Parsing config file '%s' done, username is '%s'." % (options.cfgpath, options.config.username))
         if options.daemon: