tkellem 0.8.11 → 0.9.0.beta1

data/Gemfile

@@ -1,4 +1,13 @@
 source "http://rubygems.org"
 
+$:.push File.expand_path("../lib", __FILE__)
+
+gem 'celluloid', :git => 'git://github.com/celluloid/celluloid'
+gem 'celluloid-io', :git => 'https://github.com/celluloid/celluloid-io.git'
+gem 'activesupport', '3.2.10'
+gem 'sequel', '3.42.0'
+gem 'sqlite3', '1.3.6'
+gem 'rspec', '2.5'
+
 # Specify your gem's dependencies in tkellem.gemspec
 gemspec

data/lib/tkellem/bouncer.rb

@@ -1,17 +1,21 @@
 require 'active_support/core_ext/class/attribute_accessors'
+require 'celluloid/io'
 
-require 'tkellem/irc_server'
 require 'tkellem/bouncer_connection'
 
 module Tkellem
 
 class Bouncer
+  include Celluloid::IO
   include Tkellem::EasyLogger
+  include Tkellem::CelluloidTools::LineReader
 
   attr_reader :user, :network, :nick, :network_user, :connected_at
   cattr_accessor :plugins
   self.plugins = []
 
+  class Room < Struct.new(:name, :topic, :topic_setter, :topic_time); end
+
   def initialize(network_user)
     @network_user = network_user
     @user = network_user.user
@@ -21,7 +25,7 @@ class Bouncer
     # maps { client_conn => state_hash }
     @active_conns = {}
     @welcomes = []
-    @rooms = []
+    @rooms = {}
     # maps { client_conn => away_status_or_nil }
     @away = {}
     # plugin data
@@ -29,7 +33,7 @@ class Bouncer
     # clients waiting for us to connect to the irc server
     @waiting_clients = []
 
-    connect!
+    async.connect
   end
 
   def data(key)
@@ -62,7 +66,7 @@ class Bouncer
     client.send_msg(":#{client.connecting_nick} NICK #{nick}") if client.connecting_nick != nick
     send_welcome(client)
     # make the client join all the rooms that we're in
-    @rooms.each { |room| client.simulate_join(room) }
+    @rooms.each_value { |room| client.simulate_join(room) }
 
     plugins.each { |plugin| plugin.new_client_connected(self, client) }
     check_away_status
@@ -100,6 +104,13 @@ class Bouncer
     end
   end
 
+  def receive_line(line)
+    trace "from server: #{line}"
+    return if line.blank?
+    msg = IrcMessage.parse(line)
+    server_msg(msg)
+  end
+
   def server_msg(msg)
     return if plugins.any? do |plugin|
       !plugin.server_msg(self, msg)
@@ -112,12 +123,25 @@ class Bouncer
       false
     when 'JOIN'
       debug "#{msg.target_user} joined #{msg.args.first}"
-      @rooms << msg.args.first if msg.target_user == @nick
+      @rooms[msg.args.first] = Room.new(msg.args.first) if msg.target_user == @nick
       true
     when 'PART'
       debug "#{msg.target_user} left #{msg.args.first}"
       @rooms.delete(msg.args.first) if msg.target_user == @nick
       true
+    when 'TOPIC'
+      if room = @rooms[msg.args.first]
+        room.topic = msg.args.last
+      end
+    when '332' # topic replay
+      if room = @rooms[msg.args[1]]
+        room.topic = msg.args.last
+      end
+    when '333' # topic timestamp
+      if room = @rooms[msg.args[1]]
+        room.topic_setter = msg.args[2]
+        room.topic_time = msg.args[3]
+      end
     when 'PING'
       send_msg("PONG tkellem!tkellem :#{msg.args.last}")
       false
@@ -165,22 +189,21 @@ class Bouncer
   alias_method :log_name, :name
 
   def send_msg(msg)
-    return unless @conn
     trace "to server: #{msg}"
-    @conn.send_data("#{msg}\r\n")
+    @socket.write("#{msg}\r\n")
   end
 
-  def connection_established(conn)
-    @conn = conn
+  def connection_established
+    debug "Connected"
     # TODO: support sending a real username, realname, etc
     send_msg("USER #{@user.username} somehost tkellem :#{@user.name}@tkellem")
     change_nick(@nick, true)
     @connected_at = Time.now
+    async.run
   end
 
   def disconnected!
     debug "OMG we got disconnected."
-    @conn = nil
     @connected = false
     @connected_at = nil
     @active_conns.each { |c,s| c.close_connection }
@@ -199,14 +222,26 @@ class Bouncer
     @welcomes.each { |msg| msg.args[0] = nick; bouncer_conn.send_msg(msg) }
   end
 
-  def connect!
-    @connector ||= IrcServerConnection.connector(self, network)
-    @connector.connect!
+  def connect
+    hosts = network.reload.hosts
+    # random rather than round-robin, not totally ideal
+    # Note: Celluloid::TCPSocket also is random rather than round-robin when
+    # picking the DNS IP record to connect to
+    host = hosts[rand(hosts.length)]
+    begin
+      info "Connecting to #{host}"
+      @socket = TCPSocket.new(host.address, host.port)
+      if host.ssl
+        @socket = SSLSocket.new(@socket)
+        @socket.connect
+      end
+    end
+    connection_established
   end
 
   def ready!
-    @rooms.each do |room|
-      send_msg("JOIN #{room}")
+    @rooms.each_key do |room|
+      send_msg("JOIN #{room.name}")
     end
 
     check_away_status

data/lib/tkellem/bouncer_connection.rb

@@ -1,19 +1,19 @@
 require 'active_support/core_ext/object/blank'
+require 'celluloid/io'
 
-require 'eventmachine'
 require 'tkellem/irc_message'
+require 'tkellem/celluloid_tools'
 
 module Tkellem
 
-module BouncerConnection
-  include EM::Protocols::LineText2
+class BouncerConnection
+  include Celluloid::IO
   include Tkellem::EasyLogger
+  include Tkellem::CelluloidTools::LineReader
 
-  def initialize(tkellem_server, do_ssl)
-    set_delimiter "\r\n"
-
-    @ssl = do_ssl
+  def initialize(tkellem_server, socket)
     @tkellem = tkellem_server
+    @socket = socket
 
     @state = :auth
     @name = 'new-conn'
@@ -31,24 +31,11 @@ module BouncerConnection
     @data[key] ||= {}
   end
 
-  def post_init
-    failsafe(:post_init) do
-      if ssl
-        start_tls :verify_peer => false
-      else
-        ssl_handshake_completed
-      end
-    end
-  end
-
-  def ssl_handshake_completed
-  end
-
   def error!(msg)
     info("ERROR :#{msg}")
     say_as_tkellem(msg)
     send_msg("ERROR :#{msg}")
-    close_connection(true)
+    close_connection
   end
 
   def connect_to_irc_server
@@ -90,40 +77,38 @@ module BouncerConnection
   end
 
   def receive_line(line)
-    failsafe("message: {#{line}}") do
-      trace "from client: #{line}"
-      return if line.blank?
-      msg = IrcMessage.parse(line)
-
-      command = msg.command
-      if @state != :auth && command == 'PRIVMSG' && msg.args.first == '-tkellem'
-        msg_tkellem(IrcMessage.new(nil, 'TKELLEM', [msg.args.last]))
-      elsif command == 'TKELLEM' || command == 'TK'
-        msg_tkellem(msg)
-      elsif command == 'CAP'
-        # TODO: full support for CAP -- this just gets mobile colloquy connecting
-        if msg.args.first =~ /req/i
-          send_msg("CAP NAK")
-        end
-      elsif command == 'PASS' && @state == :auth
-        @password = msg.args.first
-      elsif command == 'NICK' && @state == :auth
-        @connecting_nick = msg.args.first
-        maybe_connect
-      elsif command == 'QUIT'
-        close_connection
-      elsif command == 'USER' && @state == :auth
-        unless @username
-          @username, @conn_info = msg.args.first.strip.split('@', 2).map { |a| a.downcase }
-        end
-        maybe_connect
-      elsif @state == :auth
-        error!("Protocol error. You must authenticate first.")
-      elsif @state == :connected
-        @bouncer.client_msg(self, msg)
-      else
-        say_as_tkellem("You must connect to an irc network to do that.")
+    trace "from client: #{line}"
+    return if line.blank?
+    msg = IrcMessage.parse(line)
+
+    command = msg.command
+    if @state != :auth && command == 'PRIVMSG' && msg.args.first == '-tkellem'
+      msg_tkellem(IrcMessage.new(nil, 'TKELLEM', [msg.args.last]))
+    elsif command == 'TKELLEM' || command == 'TK'
+      msg_tkellem(msg)
+    elsif command == 'CAP'
+      # TODO: full support for CAP -- this just gets mobile colloquy connecting
+      if msg.args.first =~ /req/i
+        send_msg("CAP NAK")
       end
+    elsif command == 'PASS' && @state == :auth
+      @password = msg.args.first
+    elsif command == 'NICK' && @state == :auth
+      @connecting_nick = msg.args.first
+      maybe_connect
+    elsif command == 'QUIT'
+      close_connection
+    elsif command == 'USER' && @state == :auth
+      unless @username
+        @username, @conn_info = msg.args.first.strip.split('@', 2).map { |a| a.downcase }
+      end
+      maybe_connect
+    elsif @state == :auth
+      error!("Protocol error. You must authenticate first.")
+    elsif @state == :connected
+      @bouncer.client_msg(self, msg)
+    else
+      say_as_tkellem("You must connect to an irc network to do that.")
     end
   end
 
@@ -188,21 +173,22 @@ module BouncerConnection
   end
 
   def simulate_join(room)
-    send_msg(":#{nick} JOIN #{room}")
+    send_msg(":#{nick} JOIN #{room.name}")
     # TODO: intercept the NAMES response so that only this bouncer gets it
     # Otherwise other clients might show an "in this room" line.
-    @bouncer.send_msg("NAMES #{room}\r\n")
+    @bouncer.send_msg("NAMES #{room.name}\r\n")
+    send_msg(IrcMessage.new(":tkellem", "332",  [nick, room.name, room.topic])) if room.topic
+    send_msg(IrcMessage.new(":tkellem", "333",  [nick, room.name, room.topic_setter, room.topic_time])) if room.topic_setter && room.topic_time
   end
 
   def send_msg(msg)
+    return if @socket.closed?
     trace "to client: #{msg}"
-    send_data("#{msg}\r\n")
+    @socket.write("#{msg}\r\n")
   end
 
   def unbind
-    failsafe(:unbind) do
-      @bouncer.disconnect_client(self) if @bouncer
-    end
+    @bouncer.try(:disconnect_client, self)
   end
 end
 

data/lib/tkellem/celluloid_tools.rb

@@ -0,0 +1,131 @@
+require 'openssl'
+require 'celluloid/io'
+
+module Tkellem
+module CelluloidTools
+
+# Generates a new SSL context with a new cert and key
+# Great for easily getting up and running, but not necessarily a good idea for
+# production use
+def self.generate_ssl_ctx
+  key = OpenSSL::PKey::RSA.new(2048)
+
+  dn = OpenSSL::X509::Name.parse("/CN=tkellem-auto")
+  cert = OpenSSL::X509::Certificate.new
+  cert.version = 2
+  cert.serial = 1
+  cert.subject = dn
+  cert.issuer = dn
+  cert.public_key = key.public_key
+  cert.not_before = Time.now
+  cert.not_after = Time.now + 94670777 # 3 years
+  cert.sign(key, OpenSSL::Digest::SHA1.new)
+
+  ctx = OpenSSL::SSL::SSLContext.new
+  ctx.key = key
+  ctx.cert = cert
+
+  ctx
+end
+
+class BackoffSupervisor < ::Celluloid::SupervisionGroup
+  attr_reader :registry
+
+  def restart_actor(actor, reason)
+    member = @members.find do |member|
+      member.actor == actor
+    end
+    raise "a group member went missing. This shouldn't be!" unless member
+
+    if reason
+    end
+
+    member.restart(reason)
+  end
+end
+
+class Listener < Struct.new(:server, :callback)
+  include Celluloid::IO
+
+  def self.start(*args, &callback)
+    listener = self.new(*args)
+    listener.callback = callback
+    listener.async.run
+    listener
+  end
+
+  def run
+    loop { handle_connection(server.accept) }
+  end
+
+  def handle_connection(socket)
+    callback.(socket)
+  end
+
+  finalizer :close
+
+  def close
+    server.try(:close) unless server.try(:closed?)
+  end
+end
+
+class TCPListener < Listener
+  def initialize(host, port)
+    self.server = TCPServer.new(host, port)
+  end
+end
+
+class SSLListener < Listener
+  def initialize(host, port)
+    self.server = SSLServer.new(TCPServer.new(host, port), CelluloidTools.generate_ssl_ctx)
+  end
+end
+
+class UnixListener < Listener
+  def initialize(socket_path)
+    self.server = UNIXServer.new(socket_path)
+  end
+end
+
+module LineReader
+  def self.included(k)
+    k.send :finalizer, :close_connection
+  end
+
+  def readline
+    @delimiter ||= "\r\n"
+    @readline_buffer ||= ''
+    loop do
+      if idx = @readline_buffer.index(@delimiter)
+        postidx = idx + @delimiter.size
+        line = @readline_buffer[0, postidx]
+        @readline_buffer = @readline_buffer[postidx..-1]
+        return line
+      else
+        @socket.readpartial(4096, @readline_buffer)
+      end
+    end
+  end
+
+  def close_connection
+    @socket.close if @socket && !@socket.closed?
+  end
+
+  def run
+    loop do
+      line = readline
+      receive_line(line)
+    end
+  rescue EOFError, IOError, OpenSSL::SSL::SSLError
+    unbind
+  end
+
+  def receive_line(line)
+  end
+
+  def unbind
+  end
+end
+
+end
+end

data/lib/tkellem/daemon.rb

@@ -2,7 +2,6 @@ require 'fileutils'
 require 'optparse'
 
 require 'tkellem'
-require 'tkellem/socket_server'
 
 class Tkellem::Daemon
   attr_reader :options
@@ -86,11 +85,8 @@ class Tkellem::Daemon
   end
 
   def start
-    trap("INT") { EM.stop }
-    EM.run do
-      @admin = EM.start_unix_domain_server(socket_file, Tkellem::SocketServer)
-      Tkellem::TkellemServer.new
-    end
+    remove_files
+    Tkellem::TkellemServer.new(options).run
   ensure
     remove_files
   end
@@ -138,7 +134,7 @@ class Tkellem::Daemon
   end
 
   def remove_files
-    FileUtils.rm(socket_file)
+    FileUtils.rm(socket_file) if File.exist?(socket_file)
     return unless @daemon
     pid = File.read(pid_file) if File.file?(pid_file)
     if pid.to_i == Process.pid

data/lib/tkellem/irc_message.rb

@@ -20,7 +20,7 @@ class IrcMessage < Struct.new(:prefix, :command, :args, :ctcp)
 
     msg = self.new(prefix, command, args)
 
-    if args.last.try(:match, %r{#{"\x01"}([^ ]+)([^\1]*)#{"\x01"}})
+    if args.last && args.last.match(%r{#{"\x01"}([^ ]+)([^\1]*)#{"\x01"}})
       msg.ctcp = $1.upcase
       msg.args[-1] = $2.strip
     end

data/lib/tkellem/migrations/001_init_db.rb

@@ -1,33 +1,50 @@
-class InitDb < ActiveRecord::Migration
-  def self.up
-    create_table 'listen_addresses' do |t|
-      t.string  'address', :null => false
-      t.integer 'port', :null => false
-      t.boolean 'ssl', :null => false, :default => false
+Sequel.migration do
+  up do
+    if self.table_exists?(:schema_migrations) && self[:schema_migrations].first(:version => '1')
+      next
     end
 
-    create_table 'users' do |t|
-      t.string 'username', :null => false
-      t.string 'password'
-      t.string 'role', :null => false, :default => 'user'
+    create_table 'listen_addresses' do
+      primary_key :id
+      String  'address', :null => false
+      Integer 'port', :null => false
+      boolean 'ssl', :null => false, :default => false
     end
 
-    create_table 'networks' do |t|
-      t.belongs_to 'user'
-      t.string 'name', :null => false
+    create_table 'users' do
+      primary_key :id
+      String 'username', :null => false
+      String 'password'
+      String 'role', :null => false, :default => 'user'
     end
 
-    create_table 'hosts' do |t|
-      t.belongs_to 'network'
-      t.string  'address', :null => false
-      t.integer 'port', :null => false
-      t.boolean 'ssl', :null => false, :default => false
+    create_table 'networks' do
+      primary_key :id
+      foreign_key :user_id, :users
+      String 'name', :null => false
     end
 
-    create_table 'network_users' do |t|
-      t.belongs_to 'user'
-      t.belongs_to 'network'
-      t.string 'nick'
+    create_table 'hosts' do
+      primary_key :id
+      foreign_key :network_id, :networks
+      String  'address', :null => false
+      Integer 'port', :null => false
+      boolean 'ssl', :null => false, :default => false
     end
+
+    create_table 'network_users' do
+      primary_key :id
+      foreign_key :user_id, :users
+      foreign_key :network_id, :networks
+      String 'nick'
+    end
+  end
+
+  down do
+    drop_table 'network_users'
+    drop_table 'hosts'
+    drop_table 'networks'
+    drop_table 'users'
+    drop_table 'listen_addresses'
   end
 end

data/lib/tkellem/migrations/002_at_connect_columns.rb

@@ -1,7 +1,24 @@
-class AtConnectColumns < ActiveRecord::Migration
-  def self.up
-    add_column 'networks', 'at_connect', 'text'
-    add_column 'network_users', 'at_connect', 'text'
+Sequel.migration do
+  up do
+    if self.table_exists?(:schema_migrations) && self[:schema_migrations].first(:version => '2')
+      next
+    end
+
+    alter_table 'networks' do
+      add_column 'at_connect', String, :text => true
+    end
+    alter_table 'network_users' do
+      add_column 'at_connect', String, :text => true
+    end
+  end
+
+  down do
+    alter_table 'network_users' do
+      drop_column 'at_connect'
+    end
+    alter_table 'networks' do
+      drop_column 'at_connect'
+    end
   end
 end
 

data/lib/tkellem/migrations/003_settings.rb

@@ -1,13 +1,22 @@
-class Settings < ActiveRecord::Migration
-  def self.up
-    create_table 'settings' do |t|
-      t.string :name, :null => false
-      t.string :value, :null => false
-      t.boolean :unchanged, :null => false, :default => true
+Sequel.migration do
+  up do
+    if self.table_exists?(:schema_migrations) && self[:schema_migrations].first(:version => '3')
+      next
     end
 
-    Tkellem::Setting.make_new('user_registration', 'closed')
-    Tkellem::Setting.make_new('recaptcha_api_key', '')
-    Tkellem::Setting.make_new('allow_user_networks', 'false')
+    create_table 'settings' do
+      primary_key :id
+      String :name, :null => false
+      String :value, :null => false
+      boolean :unchanged, :null => false, :default => true
+    end
+
+    self[:settings].insert(:name => 'user_registration', :value => 'closed')
+    self[:settings].insert(:name => 'recaptcha_api_key', :value => '')
+    self[:settings].insert(:name => 'allow_user_networks', :value =>  'false')
+  end
+
+  down do
+    drop_table 'settings'
   end
 end

data/lib/tkellem/models/host.rb

@@ -1,7 +1,7 @@
 module Tkellem
 
-class Host < ActiveRecord::Base
-  belongs_to :network
+class Host < Sequel::Model
+  many_to_one :network
 
   def to_s
     self.class.address_string(address, port, ssl)

data/lib/tkellem/models/listen_address.rb

@@ -1,12 +1,24 @@
 module Tkellem
 
-class ListenAddress < ActiveRecord::Base
+class ListenAddress < Sequel::Model
+  plugin :validation_class_methods
+
   validates_uniqueness_of :port, :scope => [:address]
   validates_presence_of :address, :port
 
   def to_s
     "#{ssl ? 'ircs' : 'irc'}://#{address}:#{port}"
   end
+
+  def after_create
+    super
+    $tkellem_server.try(:after_create, self)
+  end
+
+  def after_destroy
+    super
+    $tkellem_server.try(:after_destroy, self)
+  end
 end
 
 end