Changeset 5245e9d

Timestamp:

2008-01-12T01:36:54Z (17 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

a3262d1e

Parents:

a0b206b

Message:

skyped: add authentication support
this is not yet ssl, but better than nothing

Location:

skype

Files:

• skyped.conf.dist (added)
• skyped.py (modified) (11 diffs)

skype/skyped.py

@@ -35 +35 @@
 import Skype4Py
 import threading
+import sha
+from ConfigParser import ConfigParser
 
 __version__ = "0.1.1"
@@ -41 +43 @@
 CLIENT_NAME = 'SkypeApiPythonShell'
 
-# well, this is a bit hackish. we store the socket of the last connected client
-# here and notify it. maybe later notify all connected clients?
-conn = None
-
 def input_handler(fd, io_condition):
-        input = fd.recv(1024)
-        for i in input.split("\n"):
-                skype.send(i.strip())
-        return True
+        global options
+        if options.buf:
+                for i in options.buf:
+                        skype.send(i.strip())
+                options.buf = None
+        else:
+                input = fd.recv(1024)
+                for i in input.split("\n"):
+                        skype.send(i.strip())
+                return True
 
 def idle_handler(skype):
@@ -70 +74 @@
 
 def listener(sock, *args):
-        global conn
-        conn, addr = sock.accept()
-        fileno = conn.fileno()
-        gobject.io_add_watch(conn, gobject.IO_IN, input_handler)
-        return True
+        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
+        if ret == 2:
+                dprint("Username and password OK.")
+                options.buf = nlines
+                input_handler(None, None)
+                gobject.io_add_watch(options.conn, gobject.IO_IN, input_handler)
+                return True
+        else:
+                dprint("Username and/or password WRONG.")
+                return False
 
 def dprint(msg):
@@ -89 +110 @@
 
         def recv(self, msg_text):
-                global conn
+                global options
                 if msg_text == "PONG":
                         return
@@ -110 +131 @@
                         e = i.encode('UTF-8')
                         dprint('<< ' + e)
-                        if conn:
+                        if options.conn:
                                 try:
-                                        conn.send(e + "\n")
+                                        options.conn.send(e + "\n")
                                 except IOError, s:
                                         dprint("Warning, sending '%s' failed (%s)." % (e, s))
@@ -132 +153 @@
 class Options:
         def __init__(self):
+                self.cfgpath = "/etc/skyped.conf"
                 self.daemon = True
                 self.debug = False
@@ -138 +160 @@
                 self.port = 2727
                 self.version = False
+                # well, this is a bit hackish. we store the socket of the last connected client
+                # here and notify it. maybe later notify all connected clients?
+                self.conn = None
+                # this will be read first by the input handler
+                self.buf = None
+
 
         def usage(self, ret):
@@ -145 +173 @@
 
 Options:
+        -c      --config        path to configuration file (default: %s)
         -d      --debug         enable debug messages
         -h      --help          this help
@@ -150 +179 @@
         -n      --nofork        don't run as daemon in the background
         -p      --port          set the tcp port (default: %d)
-        -v      --version       display version information""" % (self.host, self.port)
+        -v      --version       display version information""" % (self.cfgpath, self.host, self.port)
                 sys.exit(ret)
 
@@ -156 +185 @@
         options = Options()
         try:
-                opts, args = getopt.getopt(sys.argv[1:], "dhH:np:v", ["daemon", "help", "host=", "nofork", "port=", "version"])
+                opts, args = getopt.getopt(sys.argv[1:], "c:dhH:np:v", ["config=", "daemon", "help", "host=", "nofork", "port=", "version"])
         except getopt.GetoptError:
                 options.usage(1)
         for opt, arg in opts:
-                if opt in ("-d", "--debug"):
+                if opt in ("-c", "--config"):
+                        options.cfgpath = arg
+                elif opt in ("-d", "--debug"):
                         options.debug = True
                 elif opt in ("-h", "--help"):
@@ -177 +208 @@
                 print "skyped %s" % __version__
                 sys.exit(0)
-        elif options.daemon:
+        # parse our config
+        if not os.path.exists(options.cfgpath):
+                print "Can't find configuration file at '%s'." % options.cfgpath
+                print "Use the -c option to specify an alternate one."
+                sys.exit(1)
+        options.config = ConfigParser()
+        options.config.read(options.cfgpath)
+        options.config.username = options.config.get('skyped', 'username').split('#')[0]
+        options.config.password = options.config.get('skyped', 'password').split('#')[0]
+        dprint("Parsing config file '%s' done, username is '%s'." % (options.cfgpath, options.config.username))
+        if options.daemon:
                 pid = os.fork()
                 if pid == 0: