vinesmod 0.4.5 → 0.4.5.2

data/Rakefile

@@ -13,7 +13,7 @@ directory 'pkg'
 
 desc 'Build distributable packages'
 task :build => [:assets, :pkg] do
-  system 'gem build vines.gemspec && mv vines-*.gem pkg/'
+  system 'gem build vines.gemspec && mv vinesmod-*.gem pkg/'
 end
 
 Rake::TestTask.new(:test) do |test|

data/bin/vines

@@ -38,6 +38,10 @@ def parse(args)
     opts.on('-v', '--version', 'Show version') do |version|
       options[:version] = version
     end
+
+    opts.on('-D', '--debug', 'Override log level') do |debug|
+      options[:debug] = debug
+    end
   end
 
   begin
@@ -83,6 +87,7 @@ end
 opts = parse(ARGV)
 check_config(opts)
 command = Vines::Command.const_get(opts[:command].capitalize).new
+
 begin
   command.run(opts)
 rescue SystemExit

data/lib/vines.rb

@@ -5,6 +5,7 @@ module Vines
     :stream           => 'http://etherx.jabber.org/streams'.freeze,
     :client           => 'jabber:client'.freeze,
     :server           => 'jabber:server'.freeze,
+    :dialback         => 'jabber:server:dialback'.freeze,
     :component        => 'jabber:component:accept'.freeze,
     :roster           => 'jabber:iq:roster'.freeze,
     :register         => 'jabber:iq:register'.freeze,
@@ -32,27 +33,6 @@ module Vines
     :si               => 'http://jabber.org/protocol/si'.freeze,
     :byte_streams     => 'http://jabber.org/protocol/bytestreams'.freeze
   }.freeze
-
-  module Log
-    @@logger = nil
-    def log
-      unless @@logger
-        @@logger = Logger.new(STDOUT)
-        @@logger.level = Logger::INFO
-        @@logger.progname = 'vines'
-        @@logger.formatter = Class.new(Logger::Formatter) do
-          def initialize
-            @time = "%Y-%m-%dT%H:%M:%SZ".freeze
-            @fmt  = "[%s] %5s -- %s: %s\n".freeze
-          end
-          def call(severity, time, program, msg)
-            @fmt % [time.utc.strftime(@time), severity, program, msg2str(msg)]
-          end
-        end.new
-      end
-      @@logger
-    end
-  end
 end
 
 %w[

data/lib/vines/command/start.rb

@@ -6,7 +6,14 @@ module Vines
       def run(opts)
         raise 'vines [--pid FILE] start' unless opts[:args].size == 0
         require opts[:config]
-        server = XmppServer.new(Config.instance)
+
+        config = Config.instance
+        if opts[:debug]
+          config.debug = true
+          config.log("debug")
+        end
+
+        server = XmppServer.new(config)
         daemonize(opts) if opts[:daemonize]
         server.start
       end
@@ -25,4 +32,4 @@ module Vines
       end
     end
   end
-end
+end

data/lib/vines/config.rb

@@ -10,6 +10,7 @@ module Vines
     LOG_LEVELS = %w[debug info warn error fatal].freeze
 
     attr_reader :router
+    attr_accessor :debug
 
     @@instance = nil
     def self.configure(&block)
@@ -25,6 +26,8 @@ module Vines
       @vhosts, @ports, @cluster = {}, {}, nil
       @null = Storage::Null.new
       @router = Router.new(self)
+      @debug = nil
+
       instance_eval(&block)
       raise "must define at least one virtual host" if @vhosts.empty?
 

data/lib/vines/kit.rb

@@ -31,5 +31,12 @@ module Vines
       ensure
         Socket.do_not_reverse_lookup = orig
     end
+
+    # Generates dialback key as described in XEP-0185
+    def self.dialback_key(receiving_server, originating_server, stream_id)
+      sha = Digest::SHA2.new(256)
+      sha.update("#{receiving_server} #{originating_server} #{stream_id}")
+      sha.to_s
+    end
   end
 end

data/lib/vines/stream.rb

@@ -52,6 +52,7 @@ module Vines
 
     def receive_data(data)
       return if @closed
+
       @stanza_size += data.bytesize
       if @stanza_size < max_stanza_size
         @parser << data rescue error(StreamErrors::NotWellFormed.new)

data/lib/vines/stream/server.rb

@@ -73,7 +73,10 @@ module Vines
       end
 
       def ssl_handshake_completed
-        close_connection unless cert_domain_matches?(@remote_domain)
+        unless cert_domain_matches?(@remote_domain)
+          log.info { 'Cert domain not maches' }
+          close_connection
+        end
       end
 
       # Return an array of allowed authentication mechanisms advertised as
@@ -137,6 +140,7 @@ module Vines
         attrs = {
           'xmlns' => NAMESPACES[:server],
           'xmlns:stream' => NAMESPACES[:stream],
+#          'xmlns:db' => NAMESPACES[:dialback],
           'xml:lang' => 'en',
           'id' => Kit.uuid,
           'from' => @domain,

data/lib/vines/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Vines
-  VERSION = '0.4.5'
+  VERSION = '0.4.5.2'
 end

data/vines.gemspec

@@ -3,8 +3,8 @@ require './lib/vines/version'
 Gem::Specification.new do |s|
   s.name         = 'vinesmod'
   s.version      = Vines::VERSION
-  s.summary      = %q[Vines is an XMPP chat server that's easy to install and run.]
-  s.description  = %q[Vines is an XMPP chat server that supports thousands of simultaneous connections, using EventMachine and Nokogiri.]
+  s.summary      = %q[VinesMod is fork of Vines XMPP chat server]
+  s.description  = %q[VinesMod goal is to make full featured XMPP server]
 
   s.authors      = ['David Graham', 'Damian Lesiuk']
   s.email        = %w[ja@lesiuk.net]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vinesmod
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -236,8 +236,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Vines is an XMPP chat server that supports thousands of simultaneous
-  connections, using EventMachine and Nokogiri.
+description: VinesMod goal is to make full featured XMPP server
 email:
 - ja@lesiuk.net
 executables:
@@ -419,5 +418,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Vines is an XMPP chat server that's easy to install and run.
+summary: VinesMod is fork of Vines XMPP chat server
 test_files: []